From: drh <drh@noemail.net>
Date: Wed, 6 Dec 2017 20:50:08 +0000 (+0000)
Subject: Fix an unreachable branch in cases when SQLITE_ENABLE_STAT4 is not defined.
X-Git-Tag: version-3.22.0~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01f6b2dc2dd66708c362043252aa33fb49adbf36;p=thirdparty%2Fsqlite.git

Fix an unreachable branch in cases when SQLITE_ENABLE_STAT4 is not defined.

FossilOrigin-Name: 6a55bd67720451cdf316155cf348103bfce1056a78bcddf0029b45ff0fdbcc71
---

diff --git a/manifest b/manifest
index f5ffa7a07d..976bea8394 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompilation\sproblem\swhen\sboth\sSQLITE_ENABLE_MULTITHREADED_CHECKS\sand\nSQLITE_ENABLE_API_ARMOUR\sare\sdefined.
-D 2017-12-05T14:58:59.468
+C Fix\san\sunreachable\sbranch\sin\scases\swhen\sSQLITE_ENABLE_STAT4\sis\snot\sdefined.
+D 2017-12-06T20:50:08.379
 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44
@@ -546,7 +546,7 @@ F src/vdbeInt.h 1fe00770144c12c4913128f35262d11527ef3284561baaab59b947a41c08d0d9
 F src/vdbeapi.c 9c670ca0dcc1cd86373aa353b747b26fe531ca5cd4331690c611d1f03842e2a1
 F src/vdbeaux.c b02a1f842c0e916285643b8475b7189f10b76f9e7edb5e2353a913c7980f90b5
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
-F src/vdbemem.c 6e6082377183b8fd8d6f2bce45250b4c2e89bfeb534a094cd8612dae8aaa2fda
+F src/vdbemem.c 3e8c795e0874b2848658b7ca96930a7bcda3f80dc93be2a3422cd30967961e4c
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
 F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
 F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
@@ -1679,7 +1679,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 5771b1d611b3562ea6c040f3f893073c4d0ee58c35b37ae211520d9aee8ed547
-R 926398ae5d668c18adb3c9f09b2dd707
-U dan
-Z 60a10472a4a400f76cfacb5adca001dc
+P 0342ce510d2063a63839399a2cfa25b7fc02f4fde17764082676b332d6136241
+R dd71a721334f8be84f1b50254aaa4af8
+U drh
+Z e071d47cd491bbadd8e0c9ee301f9ca9
diff --git a/manifest.uuid b/manifest.uuid
index 3ccf62c280..fc1d483ded 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0342ce510d2063a63839399a2cfa25b7fc02f4fde17764082676b332d6136241
\ No newline at end of file
+6a55bd67720451cdf316155cf348103bfce1056a78bcddf0029b45ff0fdbcc71
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 3ec7394a45..17d57bbfa9 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1321,7 +1321,11 @@ static int valueFromExpr(
 
   assert( pExpr!=0 );
   while( (op = pExpr->op)==TK_UPLUS || op==TK_SPAN ) pExpr = pExpr->pLeft;
+#if defined(SQLITE_ENABLE_STAT3_OR_STAT4)
   if( op==TK_REGISTER ) op = pExpr->op2;
+#else
+  if( NEVER(op==TK_REGISTER) ) op = pExpr->op2;
+#endif
 
   /* Compressed expressions only appear when parsing the DEFAULT clause
   ** on a table column definition, and hence only when pCtx==0.  This