From: dan <dan@noemail.net>
Date: Thu, 13 May 2010 07:08:53 +0000 (+0000)
Subject: Fix for a segfault that can follow a malloc failure.
X-Git-Tag: version-3.7.2~383^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd50ddeb42ac99c98c65beca62f29f0e1c0a97e3;p=thirdparty%2Fsqlite.git

Fix for a segfault that can follow a malloc failure.

FossilOrigin-Name: 3cab9022457ce50f82c5822d8ba6c04a3a85cb6a
---

diff --git a/manifest b/manifest
index d14a522e36..d8efdf0e53 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\sVFS\sin\stest_vfs.c\sto\smatch\sthe\srefactoring\sof\sthe\sxShmXXX\smethods.
-D 2010-05-13T06:19:37
+C Fix\sfor\sa\ssegfault\sthat\scan\sfollow\sa\smalloc\sfailure.
+D 2010-05-13T07:08:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -224,7 +224,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c c66ba0b722297df063fe84edb4193ef2b05d20d0
+F src/wal.c 3806c5ed7047debc408665b3576f17bab05b2be6
 F src/wal.h 434f76f51225bb614e43ccb6bd2341541ba6a06e
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -814,7 +814,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 49d62933759d4e160ee3a4dd2aa316a2f5bbb4e6
-R f8fd118199dfa730f3f5ccb6ad378e59
+P 25e72f81561575051c63e9bf5d2c8e76f9fcf5c6
+R d6f93e9926f16286e5aafb3fc350bd84
 U dan
-Z b35bfe52883b808b3d9e1494afbcf52c
+Z c60bce3aa77615040a5ca2d947852fe0
diff --git a/manifest.uuid b/manifest.uuid
index eb9623f6b8..7b1e6c33df 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-25e72f81561575051c63e9bf5d2c8e76f9fcf5c6
\ No newline at end of file
+3cab9022457ce50f82c5822d8ba6c04a3a85cb6a
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 3c99d039ee..3c16dccc34 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -702,10 +702,10 @@ int sqlite3WalOpen(
   pRet->zWalName = zWal = pVfs->szOsFile + (char*)pRet->pWalFd;
   sqlite3_snprintf(nWal, zWal, "%s-wal", zDbName);
   rc = sqlite3OsShmOpen(pDbFd);
-  pRet->isWindexOpen = 1;
 
   /* Open file handle on the write-ahead log file. */
   if( rc==SQLITE_OK ){
+    pRet->isWindexOpen = 1;
     flags = (SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_MAIN_JOURNAL);
     rc = sqlite3OsOpen(pVfs, zWal, pRet->pWalFd, flags, &flags);
   }