From: dan <dan@noemail.net>
Date: Fri, 30 Apr 2010 10:24:54 +0000 (+0000)
Subject: Fix an assert() in sqlite3WalRead().
X-Git-Tag: version-3.7.2~455^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bc6171c231ef92411b24dcac4f6833b53e31565;p=thirdparty%2Fsqlite.git

Fix an assert() in sqlite3WalRead().

FossilOrigin-Name: 2e7a0050e192dd197d4db92393ab120897c14836
---

diff --git a/manifest b/manifest
index b94ef2bc5a..ed5ff95cce 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smissing\smutexes\sto\sunixShmClose().
-D 2010-04-30T10:06:10
+C Fix\san\sassert()\sin\ssqlite3WalRead().
+D 2010-04-30T10:24:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -221,7 +221,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 6f0fdfac56f3148b7ff2fcd60f12c2a7bdb5e0de
+F src/wal.c 153dc952b5a759dcd6200562d227c56f8e18974f
 F src/wal.h c3f347ba8f1cde46d9bcc6fedaf3ed0aa4b53294
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885
@@ -808,7 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P a8f958be804ee05c4137b3cd110db344713af5f2
-R 5f2e996a1ab6f83c7e08f128286e26ff
+P a4741cb54dd5e753d48fd05ac9dbe27ee4aa1ec0
+R 67a224d9b8436f4afd79983ba9c6427a
 U dan
-Z 8a044884de878c7767a8936662f5ee57
+Z 3903311d96c904ad2185b988a7ff9441
diff --git a/manifest.uuid b/manifest.uuid
index 8fd1613991..de04fd111d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4741cb54dd5e753d48fd05ac9dbe27ee4aa1ec0
\ No newline at end of file
+2e7a0050e192dd197d4db92393ab120897c14836
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index fa29cb58c7..38bbe458cf 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -912,7 +912,7 @@ int sqlite3WalRead(Wal *pWal, Pgno pgno, int *pInWal, u8 *pOut){
   u32 *aData; 
   int iFrame = (pWal->hdr.iLastPg & 0xFFFFFF00);
 
-  assert( pWal->lockState==SQLITE_SHM_READ );
+  assert( pWal->lockState==SQLITE_SHM_READ||pWal->lockState==SQLITE_SHM_WRITE );
   walIndexMap(pWal);
 
   /* Do a linear search of the unindexed block of page-numbers (if any)