One of the ALWAYS() macros in the previous check-in could sometimes be

false, following an OOM.  Remove it.  Problem found by dbsqlfuzz.

FossilOrigin-Name: 11df9187dad0eb33b0f6288b76d74f9700420ec855e8106b0bc71df48c485ad1

diff --git a/manifest b/manifest
index 087c27ec6f6ea4fec9bb5e0e9034c7859bfa195c..cc062ff0c6a5d81b7945449bbb1a0c8cf9c590f4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sALWAYS()\smacros.\s\sChange\ssome\sexisting\sALWAYS()\sinto\sassert().\s\sOther\ncode\ssimplifications.
-D 2022-01-24T19:38:56.880
+C One\sof\sthe\sALWAYS()\smacros\sin\sthe\sprevious\scheck-in\scould\ssometimes\sbe\nfalse,\sfollowing\san\sOOM.\s\sRemove\sit.\s\sProblem\sfound\sby\sdbsqlfuzz.
+D 2022-01-24T20:16:37.116
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -503,7 +503,7 @@ F src/date.c e25773f06a8f9043bfa1e5fa0bee93483c41933adfff0891752f00eadd12ab1c
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 52897a8516dc40753503c25eed0e305f09cc50ae474f22b0b4fd31d3b879cc08
-F src/expr.c 81c8fad48125eca7b4016499ef6fd2d0d02a070be0d8d9a5d9a8f26d13cf4861
+F src/expr.c 9658bccd1598211ace848c8ca9480dbf8be08dfee1db5cf03897b34b7b6e8fef
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 5b73f7a7c00f06017531a5bd258cbc2c7a294e55a7f84a729fe27aa525242560
 F src/func.c 8fddc42bce95d17938252a543f86fe29e479366e80fbd112a1822913b6247776
@@ -1941,8 +1941,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1f7fa46126ea33ed30e93186aff3df51068aeb4be6f79a102bfe8c4e44941d71
-R 75a506e3512f6c01f4ae9fd1a90d1003
+P 4aa27b4fcd1ffd06c38357a87ba3f5776367570439c49652f0903873def0bb23
+R b59e5f1cc647c07cf190b232b2351dd5
 U drh
-Z cfea9f4507c9cc524cff456f67a6c3d9
+Z a3bee7e8f0cdba00e9fb11d4c00d9b7c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 38d1cdd653ed3a6a035ca1ebd01185ad389a72fb..dc18e8395003e4f074ee3da7c7cfcd48aef1b414 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4aa27b4fcd1ffd06c38357a87ba3f5776367570439c49652f0903873def0bb23
\ No newline at end of file
+11df9187dad0eb33b0f6288b76d74f9700420ec855e8106b0bc71df48c485ad1
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 373b4a6346b550678ab654398894038a8fcd8915..d58097cb61faed1a29398da8f54310ebbf0e9cbc 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -209,7 +209,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
         /* The Expr.x union is never used at the same time as Expr.pRight */
         assert( ExprUseXList(p) );
         assert( p->x.pList==0 || p->pRight==0 );
-        if( p->x.pList!=0 && ALWAYS(!db->mallocFailed) ){
+        if( p->x.pList!=0 && !db->mallocFailed ){
           int i;
           for(i=0; ALWAYS(i<p->x.pList->nExpr); i++){
             if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){