From: drh <>
Date: Fri, 28 Jan 2022 21:39:29 +0000 (+0000)
Subject: When nesting Parse objects, make sure the new one has nErr set if there
X-Git-Tag: version-3.38.0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75863ec11c30d0d9c6278257b0cf48d506564636;p=thirdparty%2Fsqlite.git

When nesting Parse objects, make sure the new one has nErr set if there
has been an OOM error.

FossilOrigin-Name: ae088cbc968a565c3e0a8dd74ce150cac4a87978b593a3204f475fa196f1603c
---

diff --git a/manifest b/manifest
index 616d06e0b5..b35d09ae47 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enforce\sthe\srestriction\sthat\s'unixepoch'\sonly\sworks\sas\sthe\sfirst\smodifier\nafter\sthe\stime-value.\s\sThis\shas\sbeen\sdocumented\ssince\s2004,\sbut\shas\snever\nactually\sbeen\senforced\sbefore.\s\sAlso\sadd\snew\stest\scases\sfor\sdate/time\nfunctions\swith\sevidence\smarks.
-D 2022-01-27T13:52:01.555
+C When\snesting\sParse\sobjects,\smake\ssure\sthe\snew\sone\shas\snErr\sset\sif\sthere\nhas\sbeen\san\sOOM\serror.
+D 2022-01-28T21:39:29.986
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -547,7 +547,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
 F src/pragma.c 7c024d690a3dc93f61830f11f900e4af2357f31d081b0c79099ca5e28919cba7
 F src/pragma.h 87330ed2fbfa2a1274de93ca0ab850fba336189228cb256089202c3b52766fad
-F src/prepare.c 1e23522c934d90ff42de1b9b4f782fdf0fb690b06b92d7480b471ccb2b5899ea
+F src/prepare.c a187dade741c1f09ae118fcbbf0302511807bfc0355880927d7152eb75b8260d
 F src/printf.c 975f1f5417f2526365b6e6d7f22332e3e11806dad844701d92846292b654ba9a
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 24032ae57aec10df2f3fa2e20be0aae7d256bc704124b76c52d763440c7c0fe9
@@ -1942,8 +1942,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 a8db69411b0d1275909adeb21027784ada17af24efe3a59ae0ae2a897659ff17
-R a92b0ae1c265a80dc4f7e5c12c916bf4
+P 64fa9e8c87179211cec248e6dfd7578502e6e969a19e91a4f0e21ed9b972a6bc
+R 667bad7a5761faade1541e669d6ff48d
 U drh
-Z 47b9e1bb1e6a61a53486ee72f7ca6190
+Z 316eee84140bfead401536d9ec3a7c75
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 40297e7019..302012315c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-64fa9e8c87179211cec248e6dfd7578502e6e969a19e91a4f0e21ed9b972a6bc
\ No newline at end of file
+ae088cbc968a565c3e0a8dd74ce150cac4a87978b593a3204f475fa196f1603c
\ No newline at end of file
diff --git a/src/prepare.c b/src/prepare.c
index 4499e9a413..7e08a5a674 100644
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -660,6 +660,7 @@ void sqlite3ParseObjectInit(Parse *pParse, sqlite3 *db){
   pParse->pOuterParse = db->pParse;
   db->pParse = pParse;
   pParse->db = db;
+  if( db->mallocFailed ) sqlite3ErrorMsg(pParse, "out of memory");
 }
 
 /*
@@ -686,7 +687,7 @@ static int sqlite3Prepare(
   sParse.db = db;
   sParse.pReprepare = pReprepare;
   assert( ppStmt && *ppStmt==0 );
-  /* assert( !db->mallocFailed ); // not true with SQLITE_USE_ALLOCA */
+  if( db->mallocFailed ) sqlite3ErrorMsg(&sParse, "out of memory");
   assert( sqlite3_mutex_held(db->mutex) );
 
   /* For a long-term use prepared statement avoid the use of