Fix a memory leak in sqlite3ota.c that can follow an OOM error.

FossilOrigin-Name: c3dc15e71782fc70e92b71ad9eec0cf8ffef611f

diff --git a/ext/ota/sqlite3ota.c b/ext/ota/sqlite3ota.c
index 29172ac43f25ea24183f5b509bd205a63b8dfcba..35ee5a566f63aebe1639f9916d87e41979411f41 100644 (file)
--- a/ext/ota/sqlite3ota.c
+++ b/ext/ota/sqlite3ota.c
@@ -3334,6 +3334,8 @@ static int otaVfsOpen(
       pOtaVfs->pMain = pFd;
       sqlite3_mutex_leave(pOtaVfs->mutex);
     }
+  }else{
+    sqlite3_free(pFd->zDel);
   }
 
   return rc;

diff --git a/manifest b/manifest
index 605bfe35269409c64a087a7f2a725d92cde35286..1f003671bfeb299ee0cff5ec3778b01a6c81910e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\sOTA\salways\sspecify\sSQLITE_CONFIG_URI\swhen\sopening\sdatabases.\sFix\sa\stest\sissue\scausing\sotacrash.test\sto\sfail.
-D 2015-04-17T08:36:05.998
+C Fix\sa\smemory\sleak\sin\ssqlite3ota.c\sthat\scan\sfollow\san\sOOM\serror.
+D 2015-04-17T16:29:11.767
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 79b306896135a2305cfb7e6d88990fc4820fb917
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -138,7 +138,7 @@ F ext/ota/otaA.test ab67f7f53670b81c750dcc946c5b704f51c429a4
 F ext/ota/otacrash.test 8346192b2d46cbe7787d5d65904d81d3262a3cbf
 F ext/ota/otafault.test 8c43586c2b96ca16bbce00b5d7e7d67316126db8
 F ext/ota/otafault2.test fa202a98ca221faec318f3e5c5f39485b1256561
-F ext/ota/sqlite3ota.c 725e87f0f5f97b6521cfe15e53a420af2974dbeb
+F ext/ota/sqlite3ota.c 7a2a9f20ac8d13a2ea36382c3d63ed4897fafdca
 F ext/ota/sqlite3ota.h 5b1453917e955701b0232c0dfb0884b3d598feb1
 F ext/ota/test_ota.c e34c801c665d64b4b9e00b71f1acf8c652404b2b
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
@@ -1269,7 +1269,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d0fba72a47f73082ade40a732aab114bc8f6d83e
-R 5df3a54f3cd4535cbda82e7ad6f8185e
+P 0d0e5ec064eaecb200b9b601b7a54a1700cd176e
+R 02e7f33cd98d0e8b29b622a2f9046b41
 U dan
-Z 78b848ba36b0ed64cc210670080470ec
+Z 8d5b962ca676e7aaba586f55b85a175a

diff --git a/manifest.uuid b/manifest.uuid
index 146823acec7dc12776d54a7255ddafa4002eb432..3d5e03f47ba0c841e79dc05467a85016c515affe 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d0e5ec064eaecb200b9b601b7a54a1700cd176e
\ No newline at end of file
+c3dc15e71782fc70e92b71ad9eec0cf8ffef611f
\ No newline at end of file