From: drh <>
Date: Sat, 2 Oct 2021 17:46:24 +0000 (+0000)
Subject: Fix a harmless static-analyzer warning in sqlite3ExprCode().
X-Git-Tag: version-3.37.0~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=952f35b24d9e140c5c42df1e61c18928890c64b8;p=thirdparty%2Fsqlite.git

Fix a harmless static-analyzer warning in sqlite3ExprCode().

FossilOrigin-Name: 918c22e82ae6e366ddd094d337ed73fd23878c51745045519ed700113832545c
---

diff --git a/manifest b/manifest
index f34671f694..1cf0cb86a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\sstatic\sbuffer\sfrom\ssqlite3VdbeExpandSql().
-D 2021-10-02T17:34:28.966
+C Fix\sa\sharmless\sstatic-analyzer\swarning\sin\ssqlite3ExprCode().
+D 2021-10-02T17:46:24.515
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -501,7 +501,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 3ce6af6b64c8b476de51ccc32da0cb3142d42e65754e1d8118addf65b8bcba15
-F src/expr.c 82797e5d82422d34ede9a95ba459f40c317b2daadb21109a21abfd42f84e3ed8
+F src/expr.c ebc76aa98b9bcd556c2855942c18f4d2f52c6504c13f7285413026bdd1c7bbf5
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 1905af1821b88321e1bb9d6a69e704495b6844a9b6c29398d40117cc251e893c
 F src/func.c f4924c04e95335762ed1b24f184df26d0db5b20e87decbc5a0ed6431f7ebd9ca
@@ -1929,7 +1929,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 dd64c60bab4e2b44419db6882dfcc80b73d733ebe3bea64a7588c33fbc428234
-R e771ef06e483311628276065877f4a87
+P 953a33b7f739bb39f4a0efedcad2236c09fb798da4a519f8e1049aebe3bbf3ff
+R eec41ce7eba3f81a969c5c018c3299c3
 U drh
-Z 409febaf73a0d399cf250c72faf60d59
+Z ca31665b692f9e645cca03a4673a842f
diff --git a/manifest.uuid b/manifest.uuid
index a9fbdcb854..9a537765fe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-953a33b7f739bb39f4a0efedcad2236c09fb798da4a519f8e1049aebe3bbf3ff
\ No newline at end of file
+918c22e82ae6e366ddd094d337ed73fd23878c51745045519ed700113832545c
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index d121fbfd22..14fe8e5bdb 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4798,7 +4798,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr, int target){
   inReg = sqlite3ExprCodeTarget(pParse, pExpr, target);
   if( inReg!=target ){
     u8 op;
-    if( ExprHasProperty(pExpr,EP_Subquery) ){
+    if( ALWAYS(pExpr) && ExprHasProperty(pExpr,EP_Subquery) ){
       op = OP_Copy;
     }else{
       op = OP_SCopy;