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

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

FossilOrigin-Name: 54251f81ebc43839cc97f91d2df4c320c1b96b5690cc11ce45b60c087c9becd6
---

diff --git a/manifest b/manifest
index a1a424a211..6d5a66eef8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\ssqlite3PcacheMove()\sreally\sperforms\sa\sswap,\sthen\sbe\ssure\sto\srenumber\sthe\nsecond\spage.
-D 2022-09-02T15:09:55.423
+C Fix\san\sassert()\sassociated\swith\sthe\sdbsqlfuzz\serror\sat\s[8372468bb5d8922c].
+D 2022-09-02T17:25:25.196
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -658,7 +658,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 d27ec9a57f752fc2acf6a64d43bbf6072d2415efc976184f6d8a146e65819d3b
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
@@ -1999,8 +1999,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 aadd38f99a3e5abcf9bef49f4367752f163cc79500a28f812bb71969d7de419c
-R 15f4aa96b5fcd17c040bad40e6f9e29d
+P 81cff9f1955874aade55daa94263f58f06d966bd51ad558755f92777069a7347
+R e3f3854237e6ccbd24e5faf8a81d6554
 U drh
-Z 44f09c245350ada0933c5922c4c18b91
+Z 5ecc0e1668a222228dc4637f535ad91a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e6737916dd..fce2af451d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-81cff9f1955874aade55daa94263f58f06d966bd51ad558755f92777069a7347
\ No newline at end of file
+54251f81ebc43839cc97f91d2df4c320c1b96b5690cc11ce45b60c087c9becd6
\ 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);