From: drh <>
Date: Fri, 9 Dec 2022 17:33:21 +0000 (+0000)
Subject: Do not allow OOM faults in EQP messages associated with automatic indexes
X-Git-Tag: version-3.41.0~244^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e974e73f69adc314367b4c26f9d0c6fc0163fa23;p=thirdparty%2Fsqlite.git

Do not allow OOM faults in EQP messages associated with automatic indexes
on co-routines to go unreported.

FossilOrigin-Name: d125d5afdf1b0a1c64fc64f180898099af07b8290ea9da49419df75d8b455f71
---

diff --git a/manifest b/manifest
index aa4c045b1d..8050d01280 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments\son\sthe\snew\sco-routine\slogic.\s\sFix\sa\sC++-ism\sin\sthe\scode.\nUpdate\stest\scases\sto\saccommodate\sthe\smore\saggressive\suse\sof\sco-routines.
-D 2022-12-08T16:47:16.777
+C Do\snot\sallow\sOOM\sfaults\sin\sEQP\smessages\sassociated\swith\sautomatic\sindexes\non\sco-routines\sto\sgo\sunreported.
+D 2022-12-09T17:33:21.007
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -732,7 +732,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 3ee4050e453dfd03da4a8e4b5561d20b20b2302ec9d02437fb62c6f29bb78401
+F src/where.c 1425edc179cce7db5e7e9626b01716fed8498cc1f63875e96905d515e5e90bec
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
 F src/wherecode.c 76bca3379219880d2527493b71a3be49e696f75396d3481e4de5d4ceec7886b2
 F src/whereexpr.c 05295b44b54eea76d1ba766f0908928d0e20e990c249344c9521454d3d09c7ae
@@ -2067,8 +2067,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 ea4306a03cd8dd706100dac3f11653068a25c50c5d06c34ad08534aec0a580bc
-R c0ee619126b867e19f0a23327a8098db
+P 9243e850ae656d16adc8f0e5c4dcf3dcf476312cee192c39c38685fc437ccbbd
+R 007d4f781a18a8f9fcf2791b8d77bab0
 U drh
-Z d537a6db68af607fd73e77d57f16a3f5
+Z 822da98b746323e73cbe562572963994
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 118bbb8ad4..3f367b86a3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9243e850ae656d16adc8f0e5c4dcf3dcf476312cee192c39c38685fc437ccbbd
\ No newline at end of file
+d125d5afdf1b0a1c64fc64f180898099af07b8290ea9da49419df75d8b455f71
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 25ad18b282..d3e04808f3 100644
--- a/src/where.c
+++ b/src/where.c
@@ -836,7 +836,8 @@ static void explainAutomaticIndex(
     const char *zSep = "";
     char *zText = 0;
     int ii = 0;
-    zText = sqlite3_mprintf("CREATE AUTOMATIC INDEX ON %s(", pTab->zName);
+    sqlite3_str *pStr = sqlite3_str_new(pParse->db);
+    sqlite3_str_appendf(pStr,"CREATE AUTOMATIC INDEX ON %s(", pTab->zName);
     assert( pIdx->nColumn>1 );
     assert( pIdx->aiColumn[pIdx->nColumn-1]==XN_ROWID );
     for(ii=0; ii<(pIdx->nColumn-1); ii++){
@@ -844,13 +845,18 @@ static void explainAutomaticIndex(
       int iCol = pIdx->aiColumn[ii];
 
       zName = pTab->aCol[iCol].zCnName;
-      zText = sqlite3_mprintf("%z%s%s", zText, zSep, zName);
+      sqlite3_str_appendf(pStr, "%s%s", zSep, zName);
       zSep = ", ";
     }
-    *pAddrExplain = sqlite3VdbeExplain(
-        pParse, 0, "%s)%s", zText, (bPartial ? " WHERE <expr>" : "")
-    );
-    sqlite3_free(zText);
+    zText = sqlite3_str_finish(pStr);
+    if( zText==0 ){
+      sqlite3OomFault(pParse->db);
+    }else{
+      *pAddrExplain = sqlite3VdbeExplain(
+          pParse, 0, "%s)%s", zText, (bPartial ? " WHERE <expr>" : "")
+      );
+      sqlite3_free(zText);
+    }
   }
 }
 #else