Fix a memory leak in test code on this branch.

FossilOrigin-Name: 60cd9da9258e0b701d4bb3f9c91c5d0a12e925b9b937df619b09f33a287b4a33

diff --git a/manifest b/manifest
index a2da3a914534e19169e0b5a51138b3ff1ebd09b4..676998f5d0709de305d547575e789c49d1639316 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\schanges\sinto\sthis\sbranch.
-D 2021-10-30T17:30:48.966
+C Fix\sa\smemory\sleak\sin\stest\scode\son\sthis\sbranch.
+D 2021-10-30T17:58:25.337
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -559,7 +559,7 @@ F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a3
 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 428e813dabf82804bc13196af35a0c3c6ef4347fe557fa6717c5c66bba6e8520
-F src/test1.c f69bb12219d440b3f6ed382136d9aabe82a146532143afcb3b583d810bd9a57b
+F src/test1.c bd1c3c2637db35c0a69513e008c0e6a177b360ccae7689e0bf69f15b55e24bae
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
@@ -1930,7 +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 e00a44ac10d68b7bdaff1d9c237b598696eddc2d7392574aee1a95d94b4f165a 8ba73b3cadb72ffcf176d19f9f946c1b90b224e5ab9a0e9eb9a83affa7476d23
-R 3e81ca5107c3ba7e39985ab60d26f57d
+P 638c1b0c50229800067eb1ba29d829b4d6e008256c21a1f67b4ce4d19ea307b3
+R b67db243b6924a0dd8b6ad442b112d32
 U dan
-Z 1828748f66ed3db5a90f61fed859b997
+Z acc4c348ad53723d2b572854bf9ea0ca

diff --git a/manifest.uuid b/manifest.uuid
index b1dbe3d8a10c20fdb5176c08d05058ab42a4dd1b..ca2c021ff0a22c5feb76a0d058f2e9748ddd3826 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-638c1b0c50229800067eb1ba29d829b4d6e008256c21a1f67b4ce4d19ea307b3
\ No newline at end of file
+60cd9da9258e0b701d4bb3f9c91c5d0a12e925b9b937df619b09f33a287b4a33
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 6bf7b17d3f16a8d602c710a8814fdf88fc28cee9..db14a607dafc03ef2cbe1d996bc0bc8aef6ce635 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -8292,27 +8292,25 @@ static int SQLITE_TCLAPI test_autovacuum_pages(
   sqlite3 *db;
   int rc;
   const char *zScript;
-  size_t nScript;
   if( objc!=2 && objc!=3 ){
     Tcl_WrongNumArgs(interp, 1, objv, "DB ?SCRIPT?");
     return TCL_ERROR;
   }
   if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
   zScript = objc==3 ? Tcl_GetString(objv[2]) : 0;
-  nScript = zScript ? strlen(zScript) : 0;
-  pData = sqlite3_malloc64( sizeof(*pData) + nScript + 1 );
-  if( pData==0 ){
-    Tcl_AppendResult(interp, "out of memory", (void*)0);
-    return TCL_ERROR;
-  }
-  pData->interp = interp;
   if( zScript ){
+    size_t nScript = strlen(zScript);
+    pData = sqlite3_malloc64( sizeof(*pData) + nScript + 1 );
+    if( pData==0 ){
+      Tcl_AppendResult(interp, "out of memory", (void*)0);
+      return TCL_ERROR;
+    }
+    pData->interp = interp;
     pData->zScript = (char*)&pData[1];
     memcpy(pData->zScript, zScript, nScript+1);
     rc = sqlite3_autovacuum_pages(db,test_autovacuum_pages_callback,
                                   pData, sqlite3_free);
   }else{
-    pData->zScript = 0;
     rc = sqlite3_autovacuum_pages(db, 0, 0, 0);
   }
   if( rc ){