diff options
author | drh <drh@noemail.net> | 2018-12-12 21:34:17 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2018-12-12 21:34:17 +0000 |
commit | cb0e04f9295fa954559b5893484b0e23c48d63a6 (patch) | |
tree | d01f22d74d16f0fd105fdbbd8761c7974dcfa0c4 /src/expr.c | |
parent | 89b6de0357a499209c13cf66a3cc406f26f67e6f (diff) | |
download | sqlite-cb0e04f9295fa954559b5893484b0e23c48d63a6.tar.gz sqlite-cb0e04f9295fa954559b5893484b0e23c48d63a6.zip |
Fix another problem found by Matthew Denton's new fuzzer.
FossilOrigin-Name: 2b690dbdffe144bd69ca0aa291c230faf3d9d73f7a2985d50f016fe54003f9a9
Diffstat (limited to 'src/expr.c')
-rw-r--r-- | src/expr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index b4d101451..5d3650201 100644 --- a/src/expr.c +++ b/src/expr.c @@ -141,8 +141,8 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ while( p ){ int op = p->op; if( p->flags & EP_Generic ) break; - if( (op==TK_AGG_COLUMN || op==TK_COLUMN - || op==TK_REGISTER || op==TK_TRIGGER) + if( op==TK_REGISTER ) op = p->op2; + if( (op==TK_AGG_COLUMN || op==TK_COLUMN || op==TK_TRIGGER) && p->y.pTab!=0 ){ /* op==TK_REGISTER && p->y.pTab!=0 happens when pExpr was originally @@ -158,7 +158,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ p = p->pLeft; continue; } - if( op==TK_COLLATE || (op==TK_REGISTER && p->op2==TK_COLLATE) ){ + if( op==TK_COLLATE ){ pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); break; } |