From: drh <>
Date: Fri, 2 Sep 2022 17:26:22 +0000 (+0000)
Subject: Fix an assert() associated with the dbsqlfuzz error at [8372468bb5d8922c].
X-Git-Tag: version-3.39.3~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47405642f24466dda6392bc1b61a8f69d5df86ee;p=thirdparty%2Fsqlite.git

Fix an assert() associated with the dbsqlfuzz error at [8372468bb5d8922c].

FossilOrigin-Name: f448480e1b93d94ee852b252df6e2fd8649a08f78ab294b07f77307ac0821beb
---

diff --git a/manifest b/manifest
index d787e2cee5..7249fa1798 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\san\sOOM\soccurs\sand\ssets\sthe\sParse.nErr\svalue,\salso\sset\sthe\sParse.nErr\nvalue\sfor\sall\souter\sParse\sobjects.\ndbsqlfuzz\sd33f60aaa67733aa700cd69dacf8e0e23a327a29
-D 2022-09-02T16:45:21.914
+C Fix\san\sassert()\sassociated\swith\sthe\sdbsqlfuzz\serror\sat\s[8372468bb5d8922c].
+D 2022-09-02T17:26:22.598
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -640,7 +640,7 @@ F src/trigger.c 61bea163b1fa3039bc572ed8312461b978e5c527e5301f302b078f4c1ccdec6a
 F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
-F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
+F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
 F src/vdbe.c 3df15f0f2cd9d8faeeea18398a62f16c07fda2bfd8d726186f07508ad69b40e2
 F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
@@ -1978,9 +1978,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 34c6ec3989fd605f020efa077a0ffacf426456bab1b0290aaa517ccf04fe7de5
-Q +9a494d25944f4f640026e7a7ae2948e555d7af31487c55ed2ec2818a0789b887
-R f5886b0eb69c25494dc27064e4b31bcd
+P 073621afa2fd833a3ee976d7508a11eca67520e1bc6d5351654fa220c9397976
+Q +54251f81ebc43839cc97f91d2df4c320c1b96b5690cc11ce45b60c087c9becd6
+R 22775315e6043591e04ec368aeb06a9f
 U drh
-Z d198e0d6b69538aa640d5b349137bdef
+Z 95f81d7c73f2dccb22b437f63cf3c738
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 872902a983..facf55d46d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-073621afa2fd833a3ee976d7508a11eca67520e1bc6d5351654fa220c9397976
\ No newline at end of file
+f448480e1b93d94ee852b252df6e2fd8649a08f78ab294b07f77307ac0821beb
\ No newline at end of file
diff --git a/src/util.c b/src/util.c
index 84608739ae..32e9c27786 100644
--- a/src/util.c
+++ b/src/util.c
@@ -190,7 +190,7 @@ void sqlite3ErrorMsg(Parse *pParse, const char *zFormat, ...){
   va_list ap;
   sqlite3 *db = pParse->db;
   assert( db!=0 );
-  assert( db->pParse==pParse );
+  assert( db->pParse==pParse || db->pParse->pToplevel==pParse );
   db->errByteOffset = -2;
   va_start(ap, zFormat);
   zMsg = sqlite3VMPrintf(db, zFormat, ap);