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.

FossilOrigin-Name: 8f770d14d3dca5eb38faa89c4cba269233aa45cc4a56176fdae22f14974ceeb2

diff --git a/manifest b/manifest
index 6a6a774d582126c629a54304fdaa635f8575b0b4..0a4511f81063c6b3a640854ecc113e1361bfd55e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sinvoking\ssqlite3ExprColUsage()\son\san\sunresolve\scolumn\sreference.
-D 2023-12-13T16:50:21.904
+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.
+D 2023-12-19T13:00:21.649
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -722,7 +722,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c bde74add20fc0e8ce0c4e937a1f70a36d17413afe4f71d3e103f5cb74b17c8d9
 F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c 5459b952b3b1f491b8f0cb2aaf1aea91b9fe89336fa954d15b09547a28a83c00
+F src/resolve.c 03995d22b101713591b218d35e626a5ef4b37878a292af4653007164a97737cc
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 85857bedd2913d888aa571755b48c54cd2e6e7fcb0087e19b226ee0368cfda1e
 F src/shell.c.in cbe850737d4166347bfe5fc7d695229379347509bf114cf6abeb1e384f2d7a70
@@ -2142,9 +2142,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3874e5a3282888b5b24835194d2f6c7b93f1ef456aa70013218b21038e831ba3
-Q +ac9314c0e335694b48c613145f5397247bb88c51806cd0dc3ed4ec306db4bbad
-R e8cd65a833119df8d90c14e5adeb7343
+P 6e0e2ee7c723582be5ad9126f5cd642c3cecf615c609bc0b87e914a6f5c0c904
+Q +d2e6117e4f97ab98b01deb5fcad5520f8181d00bed8d904d34963c01d73df857
+R 82683641f262a28f5c6af14a8b17f6ce
 U drh
-Z 98d1755ef40d11ac1e81e82a3ed005bd
+Z a4561e880378ee6eb7a3b44167666c55
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9929dc76e1bbe7bfbfdda7ffefa182e667288d31..4bec7ada12271600458bcade93d1c411667a0acb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e0e2ee7c723582be5ad9126f5cd642c3cecf615c609bc0b87e914a6f5c0c904
\ No newline at end of file
+8f770d14d3dca5eb38faa89c4cba269233aa45cc4a56176fdae22f14974ceeb2
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 95f224e96c5755e1544e964d638752f64f7ede88..071736a63c03913b640b0b39d6e918af6ff227e2 100644 (file)
--- 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 );