From: drh <>
Date: Tue, 19 Dec 2023 12:49:35 +0000 (+0000)
Subject: When unable to resolve an identifier, change the Expr node into TK_NULL
X-Git-Tag: version-3.45.0~61
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=60c435dc4ba0dd0971008fb5d72287ed60c30948;p=thirdparty%2Fsqlite.git

When unable to resolve an identifier, change the Expr node into TK_NULL
rather than TK_COLUMN, to prevent any downstream misuse of the non-existent
column.  dbsqlfuzz 71869261db80a95e4733afa10ff5724bf3c78592.

FossilOrigin-Name: d2e6117e4f97ab98b01deb5fcad5520f8181d00bed8d904d34963c01d73df857
---

diff --git a/manifest b/manifest
index 97e1dfe1c5..e4c1331ea0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Always\smake\sthe\ssqlite_dbdata\svirtual\stable\savailable\sin\sthe\sCLI.
-D 2023-12-19T12:23:11.793
+C When\sunable\sto\sresolve\san\sidentifier,\schange\sthe\sExpr\snode\sinto\sTK_NULL\nrather\sthan\sTK_COLUMN,\sto\sprevent\sany\sdownstream\smisuse\sof\sthe\snon-existent\ncolumn.\s\sdbsqlfuzz\s71869261db80a95e4733afa10ff5724bf3c78592.
+D 2023-12-19T12:49:35.296
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -734,7 +734,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
 F src/printf.c 18fbdf028345c8fbe6044f5f5bfda5a10d48d6287afef088cc21b0ca57985640
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c da0a596a645cd7a8a9fd030e5126600b5639cc63f8ead18c1b67ff5a8a9b6a7f
+F src/resolve.c e25f51a473a5f30a0d978e4df2aaa98aeec84eac29ecae1ad4708a6c3e669345
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c f1a81ff4f8e9e76c224e2ab3a4baa799add0db22158c7fcede65d8cc4a6fa2da
 F src/shell.c.in 7538a5d8d15fb7c67418fc4901275847f0a7af9e7d504df410ab0d8e80c50a4c
@@ -2155,8 +2155,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P be19b84c9f3fe127165809908add148dbe9a827a55608b0490de7e69b7f7f191
-R 212fb96bb5d7fedd9358acaa914f43a5
+P e5fd3b32ad87586a7413570e568c9c1859a37a4f836cca074126471b125fb682
+R 48b9c71249fc940d37d3cf9881db1921
 U drh
-Z 8226b721ee57239e8a25af6ad532c571
+Z 1b1e95f8d5ee358910316b6cde4b39c4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9e4fda1e57..8c09dd33fc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e5fd3b32ad87586a7413570e568c9c1859a37a4f836cca074126471b125fb682
\ No newline at end of file
+d2e6117e4f97ab98b01deb5fcad5520f8181d00bed8d904d34963c01d73df857
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 43592f8abc..b4f03fe7e6 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -759,6 +759,7 @@ static int lookupName(
     sqlite3RecordErrorOffsetOfExpr(pParse->db, pExpr);
     pParse->checkSchema = 1;
     pTopNC->nNcErr++;
+    eNewExprOp = TK_NULL;
   }
   assert( pFJMatch==0 );