diff options
| author | drh <drh@noemail.net> | 2019-01-17 01:06:00 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-01-17 01:06:00 +0000 |
| commit | f20bbc5f69186e9f04b498b7de2488f3c02f7364 (patch) | |
| tree | aaf4a85de08ee1ee89036a169e4d147a17d1f0cf /src/expr.c | |
| parent | 8b20e4a3ebc5e7a1f9df1037ac8c1839b55435f4 (diff) | |
| download | sqlite-f20bbc5f69186e9f04b498b7de2488f3c02f7364.tar.gz sqlite-f20bbc5f69186e9f04b498b7de2488f3c02f7364.zip | |
Fix a failure in sqlite3ExprCompare()
FossilOrigin-Name: 835e2cc55feea2f2426c99816c27f9c35d2fd4cdd9bf1c7f46f889ecfd222778
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index b595c0adb..ed53fc7f9 100644 --- a/src/expr.c +++ b/src/expr.c @@ -4858,9 +4858,11 @@ int sqlite3ExprCompare(Parse *pParse, Expr *pA, Expr *pB, int iTab){ if( sqlite3WindowCompare(pParse,pA->y.pWin,pB->y.pWin)!=0 ) return 2; } #endif + }else if( pA->op==TK_NULL ){ + return 0; }else if( pA->op==TK_COLLATE ){ if( sqlite3_stricmp(pA->u.zToken,pB->u.zToken)!=0 ) return 2; - }else if( strcmp(pA->u.zToken,pB->u.zToken)!=0 ){ + }else if( ALWAYS(pB->u.zToken!=0) && strcmp(pA->u.zToken,pB->u.zToken)!=0 ){ return 2; } } |