Do not run resetAccumulator() after a malloc failure.

FossilOrigin-Name: 1b426603f05033bcee0331c6f664cd5ed2ebf8f5d4cde8c6673c7a699ff53bb1

diff --git a/manifest b/manifest
index 8ece11884cab8c36688fe0cc03ec5d786346f4e6..137abedde8eb7672b0b8917ce89854b4641e7821 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Fix\sanother\sfts3\sproblem\swith\sprocessing\scorrupt\srecords.
-D 2020-06-29T13:33:56.351
+C Do\snot\srun\sresetAccumulator()\safter\sa\smalloc\sfailure.
+D 2020-06-29T16:30:10.567
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -12,6 +12,7 @@ F ext/misc/ieee754.c bb6bd8e9eeeda5a7ac82839fcab5c0b8156b0532165387cc5458a97f600
 F main.mk b1cd0bc6aedad7ebb667b7f74f835f932f60ee33be2a5c3051fd93eb465f5c75
 F src/build.c ba1bbe563a3dc02d5fed20537603181e5289c13ea30ae5e775f552e7557adbfa
 F src/expr.c a3ab84399b3415f66d2d0c25f5bcd98ef465c0c07ea1f19bf2a418b1c8fcad74
+F src/select.c bc25f48e49eca122c16c247e7d4697241156e7c32c735b219be667657aa017ef
 F src/shell.c.in d663152487d4bfddea0f6d21ebc2ed51575d22657a02c6828afd344bbd4651af
 F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
 F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
@@ -25,7 +26,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P 61400ef9f1337c77263b4d3e43a1983b0c4cf7137f066a2691768c98877035ef
-R b6a82b4f5a5f516b98e31add0f21e1b3
-U dan
-Z 22a03abd679ba1af49f44240ae85a070
+P 6e0ffa205312416830340ea6e621dfb1a529e5603d569941ed6263930dc28c45
+R c714b16aae086541380bc1d9a1e44703
+U drh
+Z 43829bf0d717a497b21888e2cfe1ff4a

diff --git a/manifest.uuid b/manifest.uuid
index 62de1c16496523b29d5de958917640ab602c3cbc..45c01d8a4ddf3a0bc8e52e55ae13384f65a4f563 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e0ffa205312416830340ea6e621dfb1a529e5603d569941ed6263930dc28c45
\ No newline at end of file
+1b426603f05033bcee0331c6f664cd5ed2ebf8f5d4cde8c6673c7a699ff53bb1
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 31f22664ae711e1b86f93ceb3751a66d6e5f8222..42474d61d18d8fa10aad838217172b5867f118f0 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5373,7 +5373,7 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){
   struct AggInfo_func *pFunc;
   int nReg = pAggInfo->nFunc + pAggInfo->nColumn;
   if( nReg==0 ) return;
-  if( pParse->nErr ) return;
+  if( pParse->nErr || pParse->db->mallocFailed ) return;
 #ifdef SQLITE_DEBUG
   /* Verify that all AggInfo registers are within the range specified by
   ** AggInfo.mnReg..AggInfo.mxReg */