From: drh <>
Date: Sun, 31 Jan 2021 16:45:10 +0000 (+0000)
Subject: Mark an unreachable branch as ALWAYS().
X-Git-Tag: version-3.35.0~118^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9407b6ef29d676da3184ccd456a46049c5b3c448;p=thirdparty%2Fsqlite.git

Mark an unreachable branch as ALWAYS().

FossilOrigin-Name: cb8b797a64f65fca01c5faaeb30cbe4a53b56b81e696d1b62a90362d7ef8f924
---

diff --git a/manifest b/manifest
index a461a2acbd..b7675c721e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\sopcode\sOP_ChngCntRow\sused\sto\soutput\sthe\sresult\sof\sPRAGMA\schange_count.\nOnly\sthis\snew\sopcode,\sand\snot\sOP_ResultRow,\schecks\sfor\sforeign\skey\serrors.\nFaster\sperformance,\sand\snow\salso\sworks\swith\sRETURNING.
-D 2021-01-31T15:50:36.442
+C Mark\san\sunreachable\sbranch\sas\sALWAYS().
+D 2021-01-31T16:45:10.780
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -607,7 +607,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c c64c49d7c2ec4490c2fef1f24350167ba16b03b0c6cee58ad1a1d70a4325d4e9
 F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
-F src/trigger.c 424f81a5631a06dda99d70c6bfa3e7e6ead74ab9eb757b77f75a14a18ef7d419
+F src/trigger.c b380259579a6d9dc3fa50d49b1b18ebfe42c10f12d3c5b3d0e2f7c3b35c45574
 F src/update.c 0f5a61f0787199983530a33f6fffe4f52742f35fcdf6ccfad1078b1a8bc17723
 F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@ -1899,7 +1899,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 1f1ce7ceb9807d22efea496f33908040ee196a31cd192f27ec0fb3e23afb729c
-R ed51f62c70425c1aaf20f4ecddc8579f
+P 154fc2b15465c7c92a1af0a93851421aec42a81bab54840a9701f2c78068e14e
+R cea5f0df7552de24bb2dee28a7a1e3f6
 U drh
-Z 39d7fe9d2d8727b4a3ee19f9ebc8e8e1
+Z fb166b95a911fcb55830f05a31923ad0
diff --git a/manifest.uuid b/manifest.uuid
index 7749366dc6..3f622440c0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-154fc2b15465c7c92a1af0a93851421aec42a81bab54840a9701f2c78068e14e
\ No newline at end of file
+cb8b797a64f65fca01c5faaeb30cbe4a53b56b81e696d1b62a90362d7ef8f924
\ No newline at end of file
diff --git a/src/trigger.c b/src/trigger.c
index ae86c7c9af..de926f305d 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -821,7 +821,7 @@ static ExprList *sqlite3ExpandReturning(
     }else{
       Expr *pNewExpr = sqlite3ExprDup(db, pOldExpr, 0);
       pNew = sqlite3ExprListAppend(pParse, pNew, pNewExpr);
-      if( pList->a[i].zEName!=0 && !db->mallocFailed ){
+      if( !db->mallocFailed && ALWAYS(pList->a[i].zEName!=0) ){
         struct ExprList_item *pItem = &pNew->a[pNew->nExpr-1];
         pItem->zEName = sqlite3DbStrDup(db, pList->a[i].zEName);
         pItem->eEName = pList->a[i].eEName;