From: dan <dan@noemail.net>
Date: Tue, 7 Nov 2017 21:25:15 +0000 (+0000)
Subject: Update an assert in wal.c.
X-Git-Tag: version-3.22.0~199^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c9d8f640b5d2397e0f1338ae160f11220146d44;p=thirdparty%2Fsqlite.git

Update an assert in wal.c.

FossilOrigin-Name: 94527b897bac66d100ca92161f18b6f0e0768dd77ebcb06e3fb106f0e0e380ee
---

diff --git a/manifest b/manifest
index bb8c19984a..0f9d93ff2b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Handle\sthe\srace\scondition\sthat\smay\soccur\sif\sanother\sprocess\sconnects\sand\sthen\ncheckpoints\sand\struncates\sthe\swal\sfile\swhile\sa\sreadonly-shm\sclient\sis\sbuilding\nits\sheap-memory\swal-index.
-D 2017-11-07T21:15:07.949
+C Update\san\sassert\sin\swal.c.
+D 2017-11-07T21:25:15.188
 F Makefile.in 5bae3f2f3d42f2ad52b141562d74872c97ac0fca6c54953c91bb150a0e6427a8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3a5cb477ec3ce5274663b693164e349db63348667cd45bad78cc13d580b691e2
@@ -543,7 +543,7 @@ F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2
 F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
 F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c b3cd00a165e63ffa91f803fd678f5fc9b7e82745db79bb6c8c220678d5c7ec2f
+F src/wal.c 6227c952d86fb9cdc380ffda2413ca4f32a44309c61d10c55dec7dc7bc135ba2
 F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
 F src/walker.c d591e8a9ccf60abb010966b354fcea4aa08eba4d83675c2b281a8764c76cc22f
 F src/where.c b7a075f5fb3d912a891dcc3257f538372bb4a1622dd8ca7d752ad95ce8949ba4
@@ -1669,7 +1669,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 ba718754fa5ab8596cb84b751051de98afa2706fe6c5df39ad6d925d790719ee
-R e391f2931828dcd8c6e04450ea4ce5f1
+P 5a6703fc3f2174b3e9a624c7272ae013b73c42d6c97ffa62b58553efdb54e3bc
+R 598ffeddb9515e7bdc3f854533f484ab
 U dan
-Z a1807096877d0d55e25dd1ebf350b50a
+Z 7844b4272e27592e14850347bc28da72
diff --git a/manifest.uuid b/manifest.uuid
index 011649cacf..4a3a422204 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a6703fc3f2174b3e9a624c7272ae013b73c42d6c97ffa62b58553efdb54e3bc
\ No newline at end of file
+94527b897bac66d100ca92161f18b6f0e0768dd77ebcb06e3fb106f0e0e380ee
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 1a8bd74b02..4f8d5eadd9 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -2844,8 +2844,8 @@ int sqlite3WalFindFrame(
   {
     u32 iRead2 = 0;
     u32 iTest;
-    assert( pWal->minFrame>0 );
-    for(iTest=iLast; iTest>=pWal->minFrame; iTest--){
+    assert( pWal->bUnlocked || pWal->minFrame>0 );
+    for(iTest=iLast; iTest>=pWal->minFrame && iTest>0; iTest--){
       if( walFramePgno(pWal, iTest)==pgno ){
         iRead2 = iTest;
         break;