commit f20bbc5f69186e9f04b498b7de2488f3c02f7364
author drh <drh@noemail.net> Thu Jan 17 01:06:00 2019 +0000
committer drh <drh@noemail.net> Thu Jan 17 01:06:00 2019 +0000
tree aaf4a85de08ee1ee89036a169e4d147a17d1f0cf
parent 8b20e4a3ebc5e7a1f9df1037ac8c1839b55435f4

Fix a failure in sqlite3ExprCompare()

FossilOrigin-Name: 835e2cc55feea2f2426c99816c27f9c35d2fd4cdd9bf1c7f46f889ecfd222778

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index b595c0a..ed53fc7 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4858,9 +4858,11 @@
         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;
     }
   }