From: drh <>
Date: Thu, 30 Mar 2023 19:14:36 +0000 (+0000)
Subject: Earlier error detection for index expression usage by aggregate functions.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d4437553bf2d3ab7c22853236e2ebef2f8f30c2;p=thirdparty%2Fsqlite.git

Earlier error detection for index expression usage by aggregate functions.
dbsqlfuzz 29214ace4e25c98d2ddff8fbcf97afdda23f28b9

FossilOrigin-Name: cf8dd8cd0857f402afa43feb1b71a88f7429df89448e2321cad3777484d0c438
---

diff --git a/manifest b/manifest
index 81ddd9519f..e00fb39933 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cherrypick\sthree\sfixes\sfrom\strunk.
-D 2023-03-30T11:28:38.380
+C Earlier\serror\sdetection\sfor\sindex\sexpression\susage\sby\saggregate\sfunctions.\ndbsqlfuzz\s29214ace4e25c98d2ddff8fbcf97afdda23f28b9
+D 2023-03-30T19:14:36.212
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
-F src/expr.c 7661f8a701a9805a2a858cb46f9b9bc00218b02f2018cc3f7bfe1d393f2a9c4c
+F src/expr.c 9cd6b02315babb5ab5703118e14851fc9418989553608fedf60c5e8cfd68783a
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
@@ -2046,11 +2046,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 fbc27e18aac7e403c5888c031a57748eebcd31f47c639281c2febe3a64fc529b
-Q +1fa78fafa1340de458546526b03cf8b3e9c823913c4225d7c747ad182df5c0fc
-Q +804435a2731bd3c26278c47098854b9ee7727a686587f6208e793738fbfc0555
-Q +c9c4f287652933eb6262a3419efe7e7288f55d3db7e2ac032eeae025f665d306
-R bbb8e8c9e81ac8419477a569f7dbde0c
+P 5583ea82c6e4555081a7b9ee3c397663abbcdd626e2d1e964aeb31e6d4d4bc4c
+Q +8e841e7f025f7205959453875f2d9db36271642045593970a2b2fc20b2f847c3
+R a7fbf0363b815a8711098c1f13d1faab
 U drh
-Z 761901dddc4ad02e8ffe55112903e925
+Z fab8fc3c571825e478aab7bcefe19717
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b2cb12b032..61b64883f1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5583ea82c6e4555081a7b9ee3c397663abbcdd626e2d1e964aeb31e6d4d4bc4c
\ No newline at end of file
+cf8dd8cd0857f402afa43feb1b71a88f7429df89448e2321cad3777484d0c438
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index a95c666800..5512602252 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -6452,6 +6452,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
       if( pIEpr==0 ) break;
       if( NEVER(!ExprUseYTab(pExpr)) ) break;
       if( pExpr->pAggInfo!=0 ) break; /* Already resolved by outer context */
+      if( pParse->nErr ){ return WRC_Abort; }
 
       /* If we reach this point, it means that expression pExpr can be
       ** translated into a reference to an index column as described by
@@ -6462,7 +6463,9 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
       tmp.iTable = pIEpr->iIdxCur;
       tmp.iColumn = pIEpr->iIdxCol;
       findOrCreateAggInfoColumn(pParse, pAggInfo, &tmp);
-      if( pParse->nErr ) return WRC_Abort;
+      if( pParse->nErr ){ return WRC_Abort; }
+      assert( pAggInfo->aCol!=0 );
+      assert( tmp.iAgg<pAggInfo->nColumn );
       pAggInfo->aCol[tmp.iAgg].pCExpr = pExpr;
       pExpr->pAggInfo = pAggInfo;
       pExpr->iAgg = tmp.iAgg;