Remove an ALWAYS() from a branch in sqlite3ExprAddCollateToken() which can

be false following an OOM.
dbsqlfuzz 9e8516bf1e786c84e520ae43141b75b7399f8618.

FossilOrigin-Name: 6af4e6d054efd8445e1010aabd584f36e70dfad0de13bd0e2f1761cad4d9a7d6

diff --git a/manifest b/manifest
index f69369026876d4e13da11b26266a4c6e44e27d31..5b4e46a4c5d1448357147ef32b0147a6d8ccd8fa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sin\swhereLoopAddOr()\sthat\scan\sbe\swrong\sif\san\sOOM\soccurs\sin\nan\sOR\sconstraint\son\sa\svirtual\stable\sif\sone\sof\sthe\sterms\sof\sthe\sOR\sis\san\sIN\noperator.\s\sdbsqlfuzz\s5ee7350b40014f5a878c5d6e76913a2d619f5146
-D 2021-04-16T12:13:39.917
+C Remove\san\sALWAYS()\sfrom\sa\sbranch\sin\ssqlite3ExprAddCollateToken()\swhich\scan\nbe\sfalse\sfollowing\san\sOOM.\ndbsqlfuzz\s9e8516bf1e786c84e520ae43141b75b7399f8618.
+D 2021-04-16T12:33:52.638
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
 F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8
-F src/expr.c f18126b29be917d7369ec87b64466ac9dfc2a565df23c828fdaf432389ec7da7
+F src/expr.c 17972f20c963f4d28a3afd9ee34c32475a5ab0ef0044b4523976885eabc4d278
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
 F src/func.c 88fd711754a7241cb9f8eb1391370fd0c0cea756b3358efa274c5d1efd59af93
@@ -1912,7 +1912,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 d0e2d6742f314f71562e404980aad20de6b17e0b04c08582c18bbc4fd0360751
-R 332bb44b67c02aac523458d51b6b816e
+P 5cb40e53edcb1e54cde0e54c38a647144bc3158435df0161f95c89732de086e6
+R ddfb443f324f92c0f7d01464d567a778
 U drh
-Z ea3687369fc6da14ed3df05290b695f6
+Z 4128704ba35132d25cf1033fb5faf21a

diff --git a/manifest.uuid b/manifest.uuid
index 318fa06e381c8567f5035f7e4a7f3049ae339dd5..9b532950dcf61be611c1f16b5433570fad5aa11f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5cb40e53edcb1e54cde0e54c38a647144bc3158435df0161f95c89732de086e6
\ No newline at end of file
+6af4e6d054efd8445e1010aabd584f36e70dfad0de13bd0e2f1761cad4d9a7d6
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 898ed85194dfc51620ba07bc3ed0d6cd0df3bf40..912b604ea842845e2b27e157548d7ab12aa37bfb 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -99,7 +99,7 @@ Expr *sqlite3ExprAddCollateToken(
   if( pExpr==0 ) return 0;
   if( pExpr->op==TK_VECTOR ){
     ExprList *pList = pExpr->x.pList;
-    if( ALWAYS(pList!=0) ){
+    if( pList!=0 ){
       int i;
       for(i=0; i<pList->nExpr; i++){
         pList->a[i].pExpr = sqlite3ExprAddCollateToken(pParse,pList->a[i].pExpr,