From: dan <dan@noemail.net>
Date: Thu, 21 Nov 2019 17:14:55 +0000 (+0000)
Subject: Fix a recently introduced memory leak in the test code in test_vfs.c.
X-Git-Tag: version-3.31.0~297
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c9c70920bae0ccd6216ea7fa61f387fdeb0b6ae;p=thirdparty%2Fsqlite.git

Fix a recently introduced memory leak in the test code in test_vfs.c.

FossilOrigin-Name: 2d53a30cc23e53033af8e8666457654db5dcc453ed6cd176ce1d0bff4f528159
---

diff --git a/manifest b/manifest
index d2b8a71850..7b921546dc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\sdirect\sand\sindirect\srecursive\scontent=\soptions\sin\sfts3/4\sand\sfts5.
-D 2019-11-21T14:20:59.705
+C Fix\sa\srecently\sintroduced\smemory\sleak\sin\sthe\stest\scode\sin\stest_vfs.c.
+D 2019-11-21T17:14:55.938
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -583,7 +583,7 @@ F src/test_tclsh.c eeafce33ad2136d57e5dec10f1e9a4347447eb72ffd504a1c7b9c6bfe2e71
 F src/test_tclvar.c 33ff42149494a39c5fbb0df3d25d6fafb2f668888e41c0688d07273dcb268dfc
 F src/test_thread.c 911d15fb14e19c0c542bdc8aabf981c2f10a4858
 F src/test_vdbecov.c f60c6f135ec42c0de013a1d5136777aa328a776d33277f92abac648930453d43
-F src/test_vfs.c 323ab2719ecb8df7f83e18fb386de498954af93602dba469d42b00b68470bfc6
+F src/test_vfs.c a10a2a7c50c196153bf77c55163aa822a6c3a56411246534399cada48c355b77
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_windirent.c a895e2c068a06644eef91a7f0a32182445a893b9a0f33d0cdb4283dca2486ac1
 F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a90484215
@@ -1850,7 +1850,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 0d1055a5da8274a59f35170b1f9469597ce4c5a4c5e851a1b81d3be2ccd32871
-R 200f7549382b29efd6fcb95f943bb744
+P 2eb997327c2c369c10b7835be80112d77cb2a7cfa9fe4d564042984c21d94698
+R aec5831ff7a5bde3ac00189bc22970c2
 U dan
-Z 37f61c8ae9fc951a55a1a29cfd01745c
+Z 1f033777cb6b83f60ef12910c2c3cbe7
diff --git a/manifest.uuid b/manifest.uuid
index abafc575bf..1e276b1244 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2eb997327c2c369c10b7835be80112d77cb2a7cfa9fe4d564042984c21d94698
\ No newline at end of file
+2d53a30cc23e53033af8e8666457654db5dcc453ed6cd176ce1d0bff4f528159
\ No newline at end of file
diff --git a/src/test_vfs.c b/src/test_vfs.c
index 1245417e51..f1ed8d051f 100644
--- a/src/test_vfs.c
+++ b/src/test_vfs.c
@@ -1392,8 +1392,8 @@ static void SQLITE_TCLAPI testvfs_obj_del(ClientData cd){
   if( p->pScript ) Tcl_DecrRefCount(p->pScript);
   sqlite3_vfs_unregister(p->pVfs);
   memset(p->pVfs, 0, sizeof(sqlite3_vfs));
-  memset(p, 0, sizeof(Testvfs));
   ckfree((char *)p->pVfs);
+  memset(p, 0, sizeof(Testvfs));
   ckfree((char *)p);
 }