Do not allow error messages from sqlite3NestedParse() to leak up into the

main parse.

FossilOrigin-Name: 9c4e21abdca664d6b7bcf0043fe9ec05ef8b2949ba6ee7208abaaec1ff4ed679

diff --git a/manifest b/manifest
index fd1518604428503533c73f5635bc4f2977ba680f..9df562f653eadb54eb996ab5ca79a26bdab33f6b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\s.backup\sand\s.save\shelp\stext
-D 2022-02-19T21:25:48.787
+C Do\snot\sallow\serror\smessages\sfrom\ssqlite3NestedParse()\sto\sleak\sup\sinto\sthe\nmain\sparse.
+D 2022-02-21T00:23:49.892
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 117808943727d27e38c69de4e79237e52c89ee40f6f1a70de4e6e14b5e596cbc
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
-F src/build.c b59ff41525c10b429adc277d3bca6e433b09d055b0df8c1529385763cea8bb04
+F src/build.c 9891c2160886cf7e344d7e8f1f7177f9612916c7c67ffeacd64cb34a92d387a8
 F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
@@ -1944,8 +1944,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 e4e97505af4016c48465009686bfeffe9627e225a5b2082a5bf4baeee40db5c9
-R c48545ce64b3f1da439983ecf515b9af
-U larrybr
-Z be1dba8d96f5599719b2fc2ec5a8b0a8
+P 741651fd4b1b776b4dea156cdc987f426f7c668ece203bda6654b2c7117c8933
+R e58f244b851f39804e3706c333ceac19
+U drh
+Z 4d37dc9349c7c233094d1c870b4b22d9
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a52f1710c00cbd4b8cfd8533d92b75170046dda6..e5c4243bc00a2909a858c9b700348c50069e0eb6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-741651fd4b1b776b4dea156cdc987f426f7c668ece203bda6654b2c7117c8933
\ No newline at end of file
+9c4e21abdca664d6b7bcf0043fe9ec05ef8b2949ba6ee7208abaaec1ff4ed679
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 8b1a8009d6e569842383e52d484aaf3af9c99660..58b0710660645aee3c952cd77c776d91d9663e7d 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -333,6 +333,8 @@ void sqlite3NestedParse(Parse *pParse, const char *zFormat, ...){
   memset(PARSE_TAIL(pParse), 0, PARSE_TAIL_SZ);
   db->mDbFlags |= DBFLAG_PreferBuiltin;
   sqlite3RunParser(pParse, zSql);
+  sqlite3DbFree(db, pParse->zErrMsg);
+  pParse->zErrMsg = 0;
   db->mDbFlags = savedDbFlags;
   sqlite3DbFree(db, zSql);
   memcpy(PARSE_TAIL(pParse), saveBuf, PARSE_TAIL_SZ);