From: drh <>
Date: Mon, 26 Aug 2024 23:32:02 +0000 (+0000)
Subject: Earlier error detection while processing complex aggregate
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ac0935a760f934e2602e4ad0e691664add0ead0;p=thirdparty%2Fsqlite.git

Earlier error detection while processing complex aggregate
queries.  dbsqlfuzz 5242c2f07f4aa031aa3c80461f18e9b7619ede9b
(The previous check-in on this branch really should have been this
cherrypick.)

FossilOrigin-Name: f9c6cbc1d38f30529e064edd7a7c1471b4ac54d576c9b9f0a77b36f23ed74b1a
---

diff --git a/manifest b/manifest
index 3e032830ea..990f0e725d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Early\stermination\sof\supdateAccumulators()\safter\serror\sdetection.
-D 2024-08-26T23:19:49.477
+C Earlier\serror\sdetection\swhile\sprocessing\scomplex\saggregate\nqueries.\s\sdbsqlfuzz\s5242c2f07f4aa031aa3c80461f18e9b7619ede9b\n(The\sprevious\scheck-in\son\sthis\sbranch\sreally\sshould\shave\sbeen\sthis\ncherrypick.)
+D 2024-08-26T23:32:02.308
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -754,7 +754,7 @@ F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 682106712c043cd1d498fb6253755ca369e571b848ce9150d6e8b36e4774e67f
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 801fd50ba48fa82ceaf21ead7633cbfc3ff7308119b7977614489612e6337f6c
+F src/select.c 61fbaeaaae166fba245d5c43ca561d1fee1bc4285706deb7ba20021ac8eb0b77
 F src/shell.c.in ebb698028ec031e0b1595865500097d2005f977be0efd14bd8b0ddf634d5ed8d
 F src/sqlite.h.in c71d9ef76a6d32dc7ff2d373f2e57ce09056af26c1457bcadae5358b7628c7c3
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2192,8 +2192,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 29e9bcfa2e306ea3184c033f5d3a646263ae1399d5550c78f16bccb12ec448d3
-R e7f99d7529c7f1c52149f851ae99309e
+P faecd4505d35ae4f8112b8e18a013676d7303537845696c1f44c7988f6bf08fe
+Q +70f4973078ffc72f4ff247234e6f8e695b40803c3e7c9ed12050d97195728352
+R d727e5d0eaec830d0100a5ce8e7c01bb
 U drh
-Z 00608a22bf14e011f1839932ca411573
+Z 9bdc2c4b5f07b758f43ddb927c3d7b96
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e2e2727674..6304be7237 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-faecd4505d35ae4f8112b8e18a013676d7303537845696c1f44c7988f6bf08fe
+f9c6cbc1d38f30529e064edd7a7c1471b4ac54d576c9b9f0a77b36f23ed74b1a
diff --git a/src/select.c b/src/select.c
index 5b84d6b2c7..d57b7af240 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6735,6 +6735,7 @@ static void finalizeAggFunctions(Parse *pParse, AggInfo *pAggInfo){
   for(i=0, pF=pAggInfo->aFunc; i<pAggInfo->nFunc; i++, pF++){
     ExprList *pList;
     assert( ExprUseXList(pF->pFExpr) );
+    if( pParse->nErr ) return;
     pList = pF->pFExpr->x.pList;
     if( pF->iOBTab>=0 ){
       /* For an ORDER BY aggregate, calls to OP_AggStep were deferred.  Inputs
@@ -6954,6 +6955,7 @@ static void updateAccumulator(
   }
   for(i=0, pC=pAggInfo->aCol; i<pAggInfo->nAccumulator; i++, pC++){
     sqlite3ExprCode(pParse, pC->pCExpr, AggInfoColumnReg(pAggInfo,i));
+    if( pParse->nErr ) return;
   }
 
   pAggInfo->directMode = 0;