aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2020-02-17 00:12:04 +0000
committerdrh <drh@noemail.net>2020-02-17 00:12:04 +0000
commitbf48ce49f7c25e5d4524de9fdc5c0d505218d06d (patch)
tree4709a0faa212a52df6c81f29c01418baf344a522 /src/expr.c
parentac9e184e1f35154cd710c5fe8bbd280dc7a2aedc (diff)
downloadsqlite-bf48ce49f7c25e5d4524de9fdc5c0d505218d06d.tar.gz
sqlite-bf48ce49f7c25e5d4524de9fdc5c0d505218d06d.zip
Take care when checking the table of a TK_COLUMN expression node to see if the
table is a virtual table to first ensure that the Expr.y.pTab pointer is not null due to generated column optimizations. Ticket [4374860b29383380]. FossilOrigin-Name: 9d0d4ab95dc0c56e053c2924ed322a9ea7b25439e6f74599f706905a1994e454
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c
index 46a3f9f57..be23a5bd5 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2245,6 +2245,15 @@ int sqlite3ExprIsInteger(Expr *p, int *pValue){
}
/*
+** Return true if p is a Column node that references a virtual table.
+*/
+int sqlite3ExprIsVtabRef(Expr *p){
+ if( p->op!=TK_COLUMN ) return 0;
+ if( p->y.pTab==0 ) return 0;
+ return IsVirtual(p->y.pTab);
+}
+
+/*
** Return FALSE if there is no chance that the expression can be NULL.
**
** If the expression might be NULL or if the expression is too complex
@@ -5479,8 +5488,8 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
testcase( pExpr->op==TK_LE );
testcase( pExpr->op==TK_GT );
testcase( pExpr->op==TK_GE );
- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
+ if( sqlite3ExprIsVtabRef(pExpr->pLeft)
+ || sqlite3ExprIsVtabRef(pExpr->pRight)
){
return WRC_Prune;
}