From: dan <dan@noemail.net>
Date: Sat, 5 Aug 2017 15:30:46 +0000 (+0000)
Subject: Fix memory leak in swarmvtab.
X-Git-Tag: version-3.21.0~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d904177333cd39531a73a91a50f5544a1ecb979;p=thirdparty%2Fsqlite.git

Fix memory leak in swarmvtab.

FossilOrigin-Name: 002a9c7baccf3417c56ec7d16755ea32fdd70a654ffc75f2fc4624fd2b688aed
---

diff --git a/ext/misc/unionvtab.c b/ext/misc/unionvtab.c
index bad82295c1..8b7f4c2ee2 100644
--- a/ext/misc/unionvtab.c
+++ b/ext/misc/unionvtab.c
@@ -510,6 +510,8 @@ static int unionOpenDatabaseInner(UnionTab *pTab, UnionSrc *pSrc, char **pzErr){
   if( pTab->zNotFoundCallback ){
     char *zSql = sqlite3_mprintf("SELECT \"%w\"(%Q);",
                     pTab->zNotFoundCallback, pSrc->zFile);
+    sqlite3_close(pSrc->db);
+    pSrc->db = 0;
     if( zSql==0 ){
       *pzErr = sqlite3_mprintf("out of memory");
       return SQLITE_NOMEM;
diff --git a/manifest b/manifest
index b99a8e73e8..323396404b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sswarm\svirtual\stable\sto\sthe\sexisting\sunion\svirtual\stable\smodule.
-D 2017-08-04T20:27:13.297
+C Fix\smemory\sleak\sin\sswarmvtab.
+D 2017-08-05T15:30:46.798
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -281,7 +281,7 @@ F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c a4723b6aff748a417b5091b68a46443265c40f0d
 F ext/misc/stmt.c 6f16443abb3551e3f5813bb13ba19a30e7032830015b0f92fe0c0453045c0a11
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
-F ext/misc/unionvtab.c cd472d02a7a0c77a3cecdd3cc995cd37fa902be845cd6b1c36a66da4ce0db99a
+F ext/misc/unionvtab.c c59e3518f2bd4ea490b12e20afc2fb6837d496fdebaff507e4969ad53c61f738
 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
@@ -1642,8 +1642,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 e11e6eb1d98518ba3f0361efa1c274084c5d6325b52e8470b6873e14e00c4eff a94e2f600bc766fb459418e674b842628ba21e27cf9942c00cd533507d7b35fe
-R 92361f0d3b3c23a70000c02b5172c08c
-T +closed a94e2f600bc766fb459418e674b842628ba21e27cf9942c00cd533507d7b35fe
-U drh
-Z c15784ea0bf394ee895f45328b2477fc
+P 0f6f6f03deaba2f4bdd168980647136e8ddff4907863b62b3056b8e4665599df
+R f365a6808acdb26589f2df261eade4f9
+U dan
+Z 31ef269ee04dd02f63613adcac211879
diff --git a/manifest.uuid b/manifest.uuid
index 4948bdb0b4..543cbef5f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f6f6f03deaba2f4bdd168980647136e8ddff4907863b62b3056b8e4665599df
\ No newline at end of file
+002a9c7baccf3417c56ec7d16755ea32fdd70a654ffc75f2fc4624fd2b688aed
\ No newline at end of file