From: dan <dan@noemail.net>
Date: Wed, 10 Jun 2020 11:01:21 +0000 (+0000)
Subject: Disable AggInfo consistency checks when unwinding after an OOM.
X-Git-Tag: version-3.32.3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b410111f458271e018b852d286b5f0cdb12aaf24;p=thirdparty%2Fsqlite.git

Disable AggInfo consistency checks when unwinding after an OOM.

FossilOrigin-Name: 7e2833fb2be8e7df5b25b8db73aed60ec81780bbd3e4f11a43b5eacbd5bd01a7
---

diff --git a/manifest b/manifest
index d666e546cd..de005e09ed 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.32.3.
-D 2020-06-08T12:51:03.368
+C Disable\sAggInfo\sconsistency\schecks\swhen\sunwinding\safter\san\sOOM.
+D 2020-06-10T11:01:21.457
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -533,7 +533,7 @@ F src/printf.c 94b5419ad0a17269f76a9e968ca19cf9fa37617abed2e246fc48844e511b6bc6
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c c2008519a0654f1e7490e9281ed0397d0f14bb840d81f0b96946248afcbdb25d
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c bafed8a4f28d84e3cae12f0b6393dbcb0e4d7f6a1b2f6cf93e4b99d102829588
+F src/select.c fbdbf6d55e0095ed000332615226c0e31ffb656412304b7f03c17f5788e79f00
 F src/shell.c.in cf2d24f54412c06e5fb34af7fabc748651125e1dceac29b740e91f06d23447b6
 F src/sqlite.h.in 74342b41e9d68ff9e56b192009046f8dd0aa2bd76ce1a588f330de614ba61de7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1866,7 +1866,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 44a58d6cb135a1040807093e27e3d4bdcfd5fd2c2b52e9af1e5f01c26b321d82
-R e18d106e430b72582bd0ebe6fa3b1c2a
-U drh
-Z 79851608d3e28de92e378ebec15647c6
+P a376ec6942734e5d35c6a2c07bde9010ed4b56e412623e2121efd76017595a4f
+Q +65179814aa0ae5927bae97c10ef20f290535399b889d96d5b88931f62635f212
+R f9c919e6988b11f7b4a2a1403ad4d52a
+U dan
+Z 4b02b602e3397cbbcf09a15e5159d1d0
diff --git a/manifest.uuid b/manifest.uuid
index a6715275eb..a2ef26a6bf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a376ec6942734e5d35c6a2c07bde9010ed4b56e412623e2121efd76017595a4f
\ No newline at end of file
+7e2833fb2be8e7df5b25b8db73aed60ec81780bbd3e4f11a43b5eacbd5bd01a7
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 9e459cd903..ad8f5bec8c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6804,7 +6804,7 @@ int sqlite3Select(
 select_end:
   sqlite3ExprListDelete(db, pMinMaxOrderBy);
 #ifdef SQLITE_DEBUG
-  if( pAggInfo ){
+  if( pAggInfo && !db->mallocFailed ){
     for(i=0; i<pAggInfo->nColumn; i++){
       Expr *pExpr = pAggInfo->aCol[i].pExpr;
       assert( pExpr!=0 || db->mallocFailed );