Fix leaked filename in case DosOpen() fails. (CVS 5115)

FossilOrigin-Name: ecc6c739064922937ce66339f74403a0346aeedd

diff --git a/manifest b/manifest
index 5c02fcad81aa6448409ad8cd2dae1eed14915324..17ec26567056809fa88b00170833fc1f9b53c6ed 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Re-enable\stests\sthat\swere\saccidentally\sdisabled\sby\s(5112).\s(CVS\s5114)
-D 2008-05-09T18:03:28
+C Fix\sleaked\sfilename\sin\scase\sDosOpen()\sfails.\s(CVS\s5115)
+D 2008-05-09T19:38:24
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 8b9b8263852f0217157f9042b8e3dae7427ec739
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -118,7 +118,7 @@ F src/mutex_w32.c 133698096a2c4e81cd11ea6f4de7891c66f7b9f7
 F src/os.c f9708b7ebd902fe6969fee5660a71d50e0244cad
 F src/os.h 2ee8b0dec88f946c5371919ffa0f2fe4ac0de2e6
 F src/os_common.h e8b748b2f2ecc8a498e50bfe5d8721f189c19d2a
-F src/os_os2.c 30c378b093d9c17387ebb0ebbf21b7d55a98202b
+F src/os_os2.c 0965c36db94c64088985a3debbf8463bd5aa05d8
 F src/os_unix.c a810e2aefdaddacf479407f76f8f4ca381d231b2
 F src/os_win.c 3a60bddd07ea6f8adb2314dd5996ac97b988f403
 F src/pager.c c4e0bcb1f451d2b8601e1cf50e680d88bf175055
@@ -634,7 +634,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 18b1ee10b89bd0a98d1986dbb04b9d6cfc3dad39
-R 5c3cbbff8e8d7e1cb0958ce729640786
-U danielk1977
-Z 96d0849009ad2a098ed518c52437810b
+P bf45a3ab7a295dcc399bdcf27965f1684b0a33b8
+R 57da237ef91fecaf24c595d9efd8c265
+U pweilbacher
+Z 0e3f04d9bb50f18e2eb4ea17dbbe751e

diff --git a/manifest.uuid b/manifest.uuid
index a533bdb10d06c040ec3146afe647dc673f5c4185..2c59ffa2c809708a8d47253394b218da09356817 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bf45a3ab7a295dcc399bdcf27965f1684b0a33b8
\ No newline at end of file
+ecc6c739064922937ce66339f74403a0346aeedd
\ No newline at end of file

diff --git a/src/os_os2.c b/src/os_os2.c
index 2b0c557abe409eb8c774c2f246b0f6893f43ae21..90e6fa37db979598adb08dcd329a980c6977a787 100644 (file)
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -718,6 +718,8 @@ static int os2Open(
   if( rc != NO_ERROR ){
     OSTRACE7( "OPEN Invalid handle rc=%d: zName=%s, ulAction=%#lx, ulAttr=%#lx, ulFlags=%#lx, ulMode=%#lx\n",
               rc, zName, ulAction, ulFileAttribute, ulOpenFlags, ulOpenMode );
+    free( pFile->pathToDel );
+    pFile->pathToDel = NULL;
     if( flags & SQLITE_OPEN_READWRITE ){
       OSTRACE2( "OPEN %d Invalid handle\n", ((flags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE) );
       return os2Open( 0, zName, id,