Add ALWAYS() on branches added in [ec0ae4030968c782] that are always true.

FossilOrigin-Name: 451cef8609e96dd9244818adc5c6f240544694bcb4ae620e88f90e403e59d70f

diff --git a/manifest b/manifest
index 2175694e92ec9dc585dd146d476a8b10a7eebbb2..89fc123d14df404fc32fbaf71d0ac9ba0f86e174 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdetection\sof\scorrupt\sJSONB\sin\sthe\sjsonReturnFromBlob()\sfunction.
-D 2023-12-07T12:55:39.473
+C Add\sALWAYS()\son\sbranches\sadded\sin\s[ec0ae4030968c782]\sthat\sare\salways\strue.
+D 2023-12-07T13:14:34.585
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -686,7 +686,7 @@ F src/date.c 3b8d02977d160e128469de38493b4085f7c5cf4073193459909a6af3cf6d7c91
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
-F src/expr.c f4dbcca060fa95539f6705b5ec4cb5eeaba5c0d84ff64efca8edab7a1d776807
+F src/expr.c 05278def9c186b5875d6903ea26148c7461b9ce0344f0fd7be9a0dfea0a4538a
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
 F src/func.c 472f6dcfa39cf54f89a6aec76c79c225fb880a6c14469c15d361331662b9bf43
@@ -736,7 +736,7 @@ F src/printf.c 18fbdf028345c8fbe6044f5f5bfda5a10d48d6287afef088cc21b0ca57985640
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c a5058ae54211dc49faade7b78f21c69a3fa3ee652eb270fba6881e28e30e0497
+F src/select.c 9f55c9f3307b9888f62abe709eec245e98ff217bd14c044f93d72810bb7dc445
 F src/shell.c.in 9b6c3e641de45651ad0b5e9c26cd2f72efabee28179a5315d15c54239515ee3a
 F src/sqlite.h.in d93a4821d2f792467a60f7dc81268d1bb8634f40c31694ef254cab4f9921f96a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2153,8 +2153,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 ee70e4c1c9c41617850228e48d8df44f105cf2fbbe789340ceca6f27ad6ce5eb
-R 00cfbe2052391ca2d7a17dea6eb84d8b
+P b014736c1f80ccc46fb4b24ac04310a6ce5cb5b6653665efff366cb3bc742257
+R 4ecf43441052e986caaa2b649977f529
 U drh
-Z f70f3172c97aeaef0feb684dd3865d25
+Z 9ea0563bc67b852b5f4309987080e02f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 06299391062b67b6e4757ce52637951a48f5687b..12ad7048bf25616aef16e3e4a00c5ed7cf779c55 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b014736c1f80ccc46fb4b24ac04310a6ce5cb5b6653665efff366cb3bc742257
\ No newline at end of file
+451cef8609e96dd9244818adc5c6f240544694bcb4ae620e88f90e403e59d70f
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 047d2b6b394ea2d87c8458ad6a1452e5e3192060..b5e903d456cb11612e6c3611f1b4ad805a96ceed 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1405,7 +1405,7 @@ void sqlite3ExprDelete(sqlite3 *db, Expr *p){
   if( p ) sqlite3ExprDeleteNN(db, p);
 }
 void sqlite3ExprDeleteGeneric(sqlite3 *db, void *p){
-  if( p ) sqlite3ExprDeleteNN(db, (Expr*)p);
+  if( ALWAYS(p) ) sqlite3ExprDeleteNN(db, (Expr*)p);
 }
 
 /*
@@ -2239,7 +2239,7 @@ void sqlite3ExprListDelete(sqlite3 *db, ExprList *pList){
   if( pList ) exprListDeleteNN(db, pList);
 }
 void sqlite3ExprListDeleteGeneric(sqlite3 *db, void *pList){
-  if( pList ) exprListDeleteNN(db, (ExprList*)pList);
+  if( ALWAYS(pList) ) exprListDeleteNN(db, (ExprList*)pList);
 }
 
 /*

diff --git a/src/select.c b/src/select.c
index f61b34f5fe58f980bc4517e86fc356e7412d4075..1beaf5307d52fdcd5a75ad22538cbbf865c8c55a 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -185,7 +185,7 @@ void sqlite3SelectDelete(sqlite3 *db, Select *p){
   if( OK_IF_ALWAYS_TRUE(p) ) clearSelect(db, p, 1);
 }
 void sqlite3SelectDeleteGeneric(sqlite3 *db, void *p){
-  if( p ) clearSelect(db, (Select*)p, 1);
+  if( ALWAYS(p) ) clearSelect(db, (Select*)p, 1);
 }
 
 /*