Remove an ALWAYS() from a branch that is not always taken. The test case

found by OSSFuzz has been added to TH3.

FossilOrigin-Name: 5c7dab85535ac42c021977dbd4a39cef5a72e3d9dccff1c5ca5570a1780516cd

diff --git a/manifest b/manifest
index 3c9777d50509fd335ccf49da4592120e4fc6b3c5..e59fbf2d0972be16d02387e1f3bc46488e09d1ae 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C OSSFuzz\sfound\sa\scase\swhere\san\sassert()\sinside\ssqlite3ExprCompare()\scan\sbe\ntrue.\s\sTest\scase\sadded\sto\sTH3.
-D 2018-12-12T11:23:40.421
+C Remove\san\sALWAYS()\sfrom\sa\sbranch\sthat\sis\snot\salways\staken.\s\sThe\stest\scase\nfound\sby\sOSSFuzz\shas\sbeen\sadded\sto\sTH3.
+D 2018-12-12T20:11:23.249
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@ -459,7 +459,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c 3c8bd4e77f0244fd2bd7cc90acf116ad2f8e82d70e536637f35ac2bc99b726f9
 F src/delete.c f7938125847e8ef485448db5fbad29acb2991381a02887dd854c1617315ab9fb
-F src/expr.c d18469f0b1caf8f6835c29397c0e1723d1693d8665f462121834b39f3eb02ff6
+F src/expr.c 4c6769333c59f3df4d070b30976a27456787c660a71fa82a48acc9763df18000
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 972a4ba14296bef2303a0abbad1e3d82bc3c61f9e6ce4e8e9528bdee68748812
 F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f
@@ -1783,7 +1783,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d1db8d5894450b24bb0335983503d9bbf6cc48a0ae4b83291283fb2d32b6b25b
-R 472ee8babd9d2c33001af468ad5dd860
+P 23b62fb160d86dc9d9073bcc714601f5b7695f96abd893eafecf4b2e565b87f2
+R a39727945ca7912bc94ab91e69c8cc57
 U drh
-Z 65f270511367c67928ff0b19217a0fac
+Z 482c7d62a8f6c65ee861ef4194edc7e1

diff --git a/manifest.uuid b/manifest.uuid
index 07dafcd5e021c3410edf3849fd9a7fd15dcc04fb..ce48281f2d33fb08810d825c72d9625fd55016d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23b62fb160d86dc9d9073bcc714601f5b7695f96abd893eafecf4b2e565b87f2
\ No newline at end of file
+5c7dab85535ac42c021977dbd4a39cef5a72e3d9dccff1c5ca5570a1780516cd
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index dc6f0332cd9aa68cb0bbcc866d8b13c0a90afcba..b4d1014517ab2a981a475cc9cc00e5e9ad1f8675 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -4778,7 +4778,7 @@ int sqlite3ExprCompare(Parse *pParse, Expr *pA, Expr *pB, int iTab){
     }
   }
   if( (pA->flags & EP_Distinct)!=(pB->flags & EP_Distinct) ) return 2;
-  if( ALWAYS((combinedFlags & EP_TokenOnly)==0) ){
+  if( (combinedFlags & EP_TokenOnly)==0 ){
     if( combinedFlags & EP_xIsSelect ) return 2;
     if( (combinedFlags & EP_FixedCol)==0
      && sqlite3ExprCompare(pParse, pA->pLeft, pB->pLeft, iTab) ) return 2;