From: drh <drh@noemail.net>
Date: Sun, 14 Jul 2019 00:15:07 +0000 (+0000)
Subject: Mark an unreachable branch using ALWAYS().
X-Git-Tag: version-3.30.0~224
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08e2e8e680147a52909b292d4c0628a94f928207;p=thirdparty%2Fsqlite.git

Mark an unreachable branch using ALWAYS().

FossilOrigin-Name: 0fff105a3e501fd91877d67761459eb0323e6cf79916242027cce0d05697f554
---

diff --git a/manifest b/manifest
index c83d009764..fac0eaf63c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sthat\scould\sfollow\san\sOOM\sin\sthe\snew\sFILTER\scode.
-D 2019-07-13T18:27:54.869
+C Mark\san\sunreachable\sbranch\susing\sALWAYS().
+D 2019-07-14T00:15:07.292
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -517,7 +517,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c e6373934cdafea272d94feb224344f9fd93ff94318221b64ccabd72d98b4672e
 F src/pragma.c 925bcac0afd98a0d4255c7524b93239ab4d83893d96f7f8fdccd78d4929a39bb
 F src/pragma.h 4a9fabff14db4487a734dfeeb4be984ce662bfdccfae16145b9c732327735e13
-F src/prepare.c d633c3610c23dc98239ea445803c2a6188c2b8ab647e3df4243f369516e6c8d1
+F src/prepare.c 1fdf68a8add154bd1de978dde5a4819478e2576d5701b93db2c65d78c3daf1c8
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 17d61645b0782809aa2cc68225e93c3ed6a55ca59edcdbf599b5b4a828cec9fb
@@ -1835,7 +1835,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 8c80e81d01abde9a5032cdc1a492d0fccd8db139f78d2db9413a60cfdc8e0f64
-R 992785f29513ad28163364a115438b27
-U dan
-Z a79c487a88edbd1089ddc303df479f2f
+P 85fd70fead834aed16cffbea892b2255b4e10dd677f4dbbb96062d5ff42efdeb
+R 2916789ca16bd517dcf20e2c1512a43b
+U drh
+Z 6e17128a6889867592c726db142aced4
diff --git a/manifest.uuid b/manifest.uuid
index cf8fb215f4..d859b76fec 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-85fd70fead834aed16cffbea892b2255b4e10dd677f4dbbb96062d5ff42efdeb
\ No newline at end of file
+0fff105a3e501fd91877d67761459eb0323e6cf79916242027cce0d05697f554
\ No newline at end of file
diff --git a/src/prepare.c b/src/prepare.c
index f385c1fc71..396df7bda2 100644
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -635,7 +635,10 @@ static int sqlite3Prepare(
   rc = sParse.rc;
 
 #ifndef SQLITE_OMIT_EXPLAIN
-  if( sParse.explain && rc==SQLITE_OK && sParse.pVdbe ){
+  /* Justification for the ALWAYS(): The only way for rc to be SQLITE_OK and
+  ** sParse.pVdbe to be NULL is if the input SQL is an empty string, but in
+  ** that case, sParse.explain will be false. */
+  if( sParse.explain && rc==SQLITE_OK && ALWAYS(sParse.pVdbe) ){
     static const char * const azColName[] = {
        "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment",
        "id", "parent", "notused", "detail"