Fix a problem in sqlite3_snapshot_recover() introduced by the [8a6b0c24937e855b]...

FossilOrigin-Name: c2577eb0a4a627c65d675f1446514843486092be9cb271b682793a0107e496cd

diff --git a/manifest b/manifest
index d123a018ac0a9777fefb0038cd0731d44025398c..84a900c7c7c4ba3f1c55b36d94943842c61eafb5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\s".binary"\scommand\sin\sthe\sCLI\sto\s".crnl".\s\sThe\ssense\sof\nthe\ssetting\sis\sinverted.\s\sThe\soriginal\s".binary"\sstill\sworks\sfor\sbackwards\ncompatibility\sbut\sis\snow\sundocumented.\s\s".crnl"\sis\salso\sundocumented\son\smachines\nwhere\sit\sis\sa\sno-op\s(all\smachines\sother\sthan\sWindows).\n[forum:/forumpost/8bd0b0fbdbc12477|forum\sthread\s8bd0b0fbdbc12477]
-D 2023-08-14T13:33:19.213
+C Fix\sa\sproblem\sin\ssqlite3_snapshot_recover()\sintroduced\sby\sthe\s[8a6b0c24937e855b]\smerge.
+D 2023-08-14T18:21:56.123
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -765,7 +765,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c 57fa8f56478e5b5cb558cb425e7878515e0a105c54f96f1d1bbf4b9433529254
 F src/vtab.c 1ecf8c3745d29275688d583e12822fa984d421e0286b5ef50c137bc3bf6d7a64
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 02e10f033a6972bc7d50122b400318003199c504cda48f61ad404564505f4e89
+F src/wal.c 3b068bc1db5d42d72b940c377b6fdb0e6d41bc106c5e99bfc40bbbe973e5f3e2
 F src/wal.h 04a9e53121d5076f2a173b0f2facb39d33047093fee71bd3bbe6b1f6f1f5fd4b
 F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
 F src/where.c b8917792f1e0dbfa28fb29e6cd3d560060d69667be0ba4c491cbc772363264f5
@@ -2091,8 +2091,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 391e21bb6e0b2f4632972b6617a3a18192f88deb29eee5bc060846468e624b21
-R 676721f5b95d5972349e28e60fde58e8
-U drh
-Z 343246f1d1f398cedd6a7b7f3f3868a2
+P 544de2da09cd7b9bbb6cb4c52bb22325ace3391fca00c6a43847bfc158032b66
+R a0b73071de83a84cf4d127819242513e
+U dan
+Z e2505e5a9210a6df91bb91a015427010
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e65d56dc1652c81a6f6133358403f5a276bce8c9..f0f0ce3b08cc306c0d00aab1b0634e05753bb04a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-544de2da09cd7b9bbb6cb4c52bb22325ace3391fca00c6a43847bfc158032b66
\ No newline at end of file
+c2577eb0a4a627c65d675f1446514843486092be9cb271b682793a0107e496cd
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index c9d8eaebe53ed9329c8c5ce0aa03d243667bbdae..4ee5d80f79b87aaccd8820b3344081f73659f8c6 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -3163,7 +3163,8 @@ static int walSnapshotRecover(
 
       rc = walHashGet(pWal, walFramePage(i), &sLoc);
       if( rc!=SQLITE_OK ) break;
-      pgno = sLoc.aPgno[i-sLoc.iZero];
+      assert( i - sLoc.iZero - 1 >=0 );
+      pgno = sLoc.aPgno[i-sLoc.iZero-1];
       iDbOff = (i64)(pgno-1) * szPage;
 
       if( iDbOff+szPage<=szDb ){