From: drh <drh@noemail.net>
Date: Sat, 14 Dec 2019 15:01:55 +0000 (+0000)
Subject: Make the sqlite3ExprCodeTarget() expression code generator routine robust
X-Git-Tag: version-3.31.0~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aac30f9b5020f5af1bce935f3d90e9dab3722ba2;p=thirdparty%2Fsqlite.git

Make the sqlite3ExprCodeTarget() expression code generator routine robust
in the face of unknown opcodes - it simply generates a NULL value.

FossilOrigin-Name: f8e876c82a246ceed32b166f64e05dfe5ce4ab4c6820be60404109b43d36bb80
---

diff --git a/manifest b/manifest
index b99965e3de..2c90ffc99f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\sin\sfts3\swith\sprocessing\scorrupt\srecords\sand\sundefined\sinteger\soverflows.
-D 2019-12-14T14:15:21.800
+C Make\sthe\ssqlite3ExprCodeTarget()\sexpression\scode\sgenerator\sroutine\srobust\nin\sthe\sface\sof\sunknown\sopcodes\s-\sit\ssimply\sgenerates\sa\sNULL\svalue.
+D 2019-12-14T15:01:55.918
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -479,7 +479,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c 6c407e549406c10fde9ac3987f6d734459205239ad370369bc5fcd683084a4fa
 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
-F src/expr.c 947911a1826673add2311e8650aeaf9c2809706dfaa45fc2445a5ff32f70693d
+F src/expr.c 530df5b8b684f94f0217115da30d292964385a83e87945bd9d7d792b08eb7d17
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -1852,7 +1852,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 052fdf5e58b41ccadaa5aac293ceb4d309ced661d46f3a52be9eb8d01d347a82
-R e3e5166e62c991d8b782b6533f40e85d
-U dan
-Z 2fcdc36e2d58b6d19eb97fe22b33d40d
+P 3b873029ef1903f76442445343af3786cd59ee66b0e5e0e6b76a0b6b1b5eb88a
+R 85c383a5f778e584f7e14589390faee1
+U drh
+Z d36aae0806eadd62df0ee61e4708a6ba
diff --git a/manifest.uuid b/manifest.uuid
index d045a1c8e6..49c0032f3f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b873029ef1903f76442445343af3786cd59ee66b0e5e0e6b76a0b6b1b5eb88a
\ No newline at end of file
+f8e876c82a246ceed32b166f64e05dfe5ce4ab4c6820be60404109b43d36bb80
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 3b2b513b6d..c6920b3c81 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3699,7 +3699,8 @@ expr_code_doover:
       sqlite3VdbeLoadString(v, target, pExpr->u.zToken);
       return target;
     }
-    case TK_NULL: {
+    default: {
+      testcase( op!=TK_NULL );
       sqlite3VdbeAddOp2(v, OP_Null, 0, target);
       return target;
     }
@@ -4210,7 +4211,7 @@ expr_code_doover:
     ** or if there is no matching Ei, the ELSE term Y, or if there is
     ** no ELSE term, NULL.
     */
-    default: assert( op==TK_CASE ); {
+    case TK_CASE: {
       int endLabel;                     /* GOTO label for end of CASE stmt */
       int nextCase;                     /* GOTO label for next WHEN clause */
       int nExpr;                        /* 2x number of WHEN terms */