Fix a minor memory leak in the shell tool. Omit running fuzztest as part of the Devic...

FossilOrigin-Name: 4d70f27b7b5681cfdf1c44ac654e565ccff089e74d3edf6660578e04e4b0c9b9

diff --git a/manifest b/manifest
index 2b508325cceab40b9787ebc07490c70db2fe5aef..b001a33bd476eb54bb79c9f870c04f723ed47166 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--remove\sand\s--glob\soptions\sto\sthe\s.archive\scommand\sin\sthe\sCLI.
-D 2021-11-02T11:24:37.707
+C Fix\sa\sminor\smemory\sleak\sin\sthe\sshell\stool.\sOmit\srunning\sfuzztest\sas\spart\sof\sthe\sDevice-One\srelease\stest\sconfiguration,\sas\sit\sis\snow\sincompatible\swith\sSQLITE_OMIT_VIRTUALTABLE.
+D 2021-11-02T14:01:41.022
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -550,7 +550,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c ae65c88f5d0d4bc0052b203773d407efa2387c2bd6b202f87178006c7bb8632c
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 32d25b5af6c708aa63373c78c2e59681910387a7a78c08ec3086cadc77d41627
-F src/shell.c.in de92da03b04734618508a968d719e30e4c4bcc53ec7f341cdbf6a3d68ce9721c
+F src/shell.c.in f8854bcb0d14707d661732698d5210d7f01694000c46e8014b323ad18f575be6
 F src/sqlite.h.in 99786216caf1c57aa3d70f95a7f84566dff6a9eeb50174799ea3b387eafd2a22
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h d8f6f67ae9ad990a70dd03c093bcdc8883e159ff4bfd16a496f8fb80c6840b5a
@@ -1303,7 +1303,7 @@ F test/recover.test ccb8c2623902a92ebb76770edd075cb4f75a4760bb7afde38026572c6e79
 F test/regexp1.test 0c3ff80f66b0eff80e623eb5db7a3dad512095c573d78ac23009785f6d8f51ce
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
-F test/releasetest_data.tcl 0f844b4884df67619768400eb8e4dd55708397d1728b52a2d41a8b76fb62ca7e
+F test/releasetest_data.tcl b65eabbc8d267f8b5e3a428c9c0622eba553b15f130c1f836636b4f4f752df85
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/returning1.test f96c7245f6ac16038e802760cd90b93479369939a8a7a44e2329ee5aed28239c
@@ -1930,8 +1930,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 948c2cb2a2f44ba069cfbf5e9a57e56964f3a40db57459bb439bea9c3bd9f211 06a5bf4348d3125bb5407fe9b7d451800b113a91fd1a9dff7d840e2317a7284d
-R f46c66c5f5478852cd34fd93fbf63860
-T +closed 06a5bf4348d3125bb5407fe9b7d451800b113a91fd1a9dff7d840e2317a7284d
-U drh
-Z 771f78dc461a27a09496c36528b0ec04
+P ea7b12cdf868fdfebc0a20bdcba97aea863284b563d478b0e4cb3d2a8612afee
+R 3d1a7f83cfea378cf032a2dcbfc8d068
+U dan
+Z 5939626746911ed0a46ebf821b25baad

diff --git a/manifest.uuid b/manifest.uuid
index 044d5f931411904a88a20af782929210a01a0746..f98260923752679856d91e9efa50a62024d2fc00 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea7b12cdf868fdfebc0a20bdcba97aea863284b563d478b0e4cb3d2a8612afee
\ No newline at end of file
+4d70f27b7b5681cfdf1c44ac654e565ccff089e74d3edf6660578e04e4b0c9b9
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 69b1c141defe9095ac364a1ecf08871615c702a1..f136103b34a99ec82c886236819726224317a1b0 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8456,6 +8456,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     if( sCtx.in==0 ){
       utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
       rc = 1;
+      import_cleanup(&sCtx);
       goto meta_command_exit;
     }
     if( eVerbose>=2 || (eVerbose>=1 && useOutputMode) ){

diff --git a/test/releasetest_data.tcl b/test/releasetest_data.tcl
index 878b546db2ecc7f140f2fedfa2a82ecd8c09cbe8..b8384986392de90a463ad2d8124b66504fdfab21 100644 (file)
--- a/test/releasetest_data.tcl
+++ b/test/releasetest_data.tcl
@@ -304,7 +304,7 @@ array set ::Platforms [strip_comments {
     "Devkit"                  "" test
     "Apple"                   "" test
     "Sanitize*"               "" test
-    "Device-One"              "" "fuzztest alltest"
+    "Device-One"              "" alltest
     "Default"                 "" "threadtest fuzztest alltest"
     "Valgrind*"               "" valgrindtest
   }