From: drh <>
Date: Mon, 26 Aug 2024 23:19:49 +0000 (+0000)
Subject: Early termination of updateAccumulators() after error detection.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36e08ad5408197db46730e749f0d10b04f26ab75;p=thirdparty%2Fsqlite.git

Early termination of updateAccumulators() after error detection.

FossilOrigin-Name: faecd4505d35ae4f8112b8e18a013676d7303537845696c1f44c7988f6bf08fe
---

diff --git a/manifest b/manifest
index bdbc4ee228..3e032830ea 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bind\sthe\snew\sdebug\sparameters\sin\sfuzzinvariants.c.
-D 2024-08-26T16:15:39.378
+C Early\stermination\sof\supdateAccumulators()\safter\serror\sdetection.
+D 2024-08-26T23:19:49.477
 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 1a841c38974d45cf15a7611398479182b61ad4c187423c380741d8b1688fe607
+F src/select.c 801fd50ba48fa82ceaf21ead7633cbfc3ff7308119b7977614489612e6337f6c
 F src/shell.c.in ebb698028ec031e0b1595865500097d2005f977be0efd14bd8b0ddf634d5ed8d
 F src/sqlite.h.in c71d9ef76a6d32dc7ff2d373f2e57ce09056af26c1457bcadae5358b7628c7c3
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2192,9 +2192,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 074002718b2ecb9faa99e4509ee26aaf55b6d9301804e9d13b81708c4754a5a0
-Q +7e1dc263051cf50db04643d1a2aa9f91559b2b121859b750ce4446012d5f3c3e
-R c19761d380cffa4bc4370f5c2b36697e
+P 29e9bcfa2e306ea3184c033f5d3a646263ae1399d5550c78f16bccb12ec448d3
+R e7f99d7529c7f1c52149f851ae99309e
 U drh
-Z 2097235e256ae860360462f9c135b414
+Z 00608a22bf14e011f1839932ca411573
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 07a4cbc9d5..e2e2727674 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29e9bcfa2e306ea3184c033f5d3a646263ae1399d5550c78f16bccb12ec448d3
+faecd4505d35ae4f8112b8e18a013676d7303537845696c1f44c7988f6bf08fe
diff --git a/src/select.c b/src/select.c
index 9278ea18b8..5b84d6b2c7 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6944,6 +6944,7 @@ static void updateAccumulator(
     if( addrNext ){
       sqlite3VdbeResolveLabel(v, addrNext);
     }
+    if( pParse->nErr ) return;
   }
   if( regHit==0 && pAggInfo->nAccumulator ){
     regHit = regAcc;