From: drh <>
Date: Wed, 13 Dec 2023 16:50:21 +0000 (+0000)
Subject: Avoid invoking sqlite3ExprColUsage() on an unresolve column reference.
X-Git-Tag: version-3.44.3~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1088fc83874e6f2df1737dbaa2f5cc6bcd87737f;p=thirdparty%2Fsqlite.git

Avoid invoking sqlite3ExprColUsage() on an unresolve column reference.

FossilOrigin-Name: 6e0e2ee7c723582be5ad9126f5cd642c3cecf615c609bc0b87e914a6f5c0c904
---

diff --git a/manifest b/manifest
index 47aebf50d1..6a6a774d58 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Worker1\sPromiser\sAPI:\swhen\smultiple\sdb\sconnections\sare\sactive\sthen\suse\sthe\srequested\sconnection\sinstead\sof\salways\sthe\sfirst-opened\sconnection.\sBug\sreported\sin\s[forum:894c330e7f23b177|forum\spost\s894c330e7f23b177].
-D 2023-12-12T17:55:20.991
+C Avoid\sinvoking\ssqlite3ExprColUsage()\son\san\sunresolve\scolumn\sreference.
+D 2023-12-13T16:50:21.904
 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 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
+F src/resolve.c 5459b952b3b1f491b8f0cb2aaf1aea91b9fe89336fa954d15b09547a28a83c00
 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 67da596d82ec0ed3c679da3be9d7379c557cd2fb83d7d833556107caf31327f6
-Q +194276e18e0268829061c09317e7f9f527a703eb45f1755ff1dd30bd99dc1b68
-R c3422221817dedf3fb4f695e7474155b
-U stephan
-Z 9be55331700e3fc8a76d7c7e2273b7a8
+P 3874e5a3282888b5b24835194d2f6c7b93f1ef456aa70013218b21038e831ba3
+Q +ac9314c0e335694b48c613145f5397247bb88c51806cd0dc3ed4ec306db4bbad
+R e8cd65a833119df8d90c14e5adeb7343
+U drh
+Z 98d1755ef40d11ac1e81e82a3ed005bd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index af58d50602..9929dc76e1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3874e5a3282888b5b24835194d2f6c7b93f1ef456aa70013218b21038e831ba3
\ No newline at end of file
+6e0e2ee7c723582be5ad9126f5cd642c3cecf615c609bc0b87e914a6f5c0c904
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 0072f6b6aa..95f224e96c 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -182,6 +182,7 @@ Bitmask sqlite3ExprColUsed(Expr *pExpr){
   assert( ExprUseYTab(pExpr) );
   pExTab = pExpr->y.pTab;
   assert( pExTab!=0 );
+  assert( n < pExTab->nCol );
   if( (pExTab->tabFlags & TF_HasGenerated)!=0
    && (pExTab->aCol[n].colFlags & COLFLAG_GENERATED)!=0
   ){
@@ -784,7 +785,7 @@ static int lookupName(
   ** If a generated column is referenced, set bits for every column
   ** of the table.
   */
-  if( pExpr->iColumn>=0 && pMatch!=0 ){
+  if( pExpr->iColumn>=0 && cnt==1 && pMatch!=0 ){
     pMatch->colUsed |= sqlite3ExprColUsed(pExpr);
   }