From: drh <>
Date: Tue, 20 Apr 2021 20:48:15 +0000 (+0000)
Subject: More aggressive detection of database corruption in the rebuildPage() routine.
X-Git-Tag: version-3.36.0~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cae5a4a4706be4bed8b1c6a62e2923d669e0ae5;p=thirdparty%2Fsqlite.git

More aggressive detection of database corruption in the rebuildPage() routine.

FossilOrigin-Name: a18c65068b16eae3c0725356d7f4775774b23e248c700cef8c15f23459fba68f
---

diff --git a/manifest b/manifest
index 155d9af75a..a8d9b104c9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\san\sassert()\sin\sbtree.c\sthat\smay\sfail\swith\sa\scorrupt\sdatabase.
-D 2021-04-20T13:31:51.808
+C More\saggressive\sdetection\sof\sdatabase\scorruption\sin\sthe\srebuildPage()\sroutine.
+D 2021-04-20T20:48:15.264
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 3555069cbe0ce29b44b3b5c7f1c09ee32ce0f52d23ae65e92f7532fba8596962
+F src/btree.c df156adf8b9e9532444d32b14548e35857f5be63c7318cfaa22115eaf77c76c9
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c 45889a1ac425eb7d60113ce65a519c55c5d5d01f2a9e978ab1467f8653bb57eb
@@ -1913,7 +1913,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 a61c0e6b78bd39f55464fafd257e68effded64995a66e8fa2d686e8c507ebe43
-R 80a099121546ddcbcae1fc148b1f5d09
-U dan
-Z d05d5bd1ee90a7e2be097cae4a0b9410
+P d74bf88c5a027cf080a2892a3538fe5104952b5b3759a6eba1b1a98a75ddf5f4
+R 146268cd6811e69e250b31bcf994c66e
+U drh
+Z 17d2d4ab29ad0140facb747d5996c2c2
diff --git a/manifest.uuid b/manifest.uuid
index af239d71e6..68aa084580 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d74bf88c5a027cf080a2892a3538fe5104952b5b3759a6eba1b1a98a75ddf5f4
\ No newline at end of file
+a18c65068b16eae3c0725356d7f4775774b23e248c700cef8c15f23459fba68f
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index a4179a48fc..7083f8d386 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -7015,7 +7015,7 @@ static int rebuildPage(
     u8 *pCell = pCArray->apCell[i];
     u16 sz = pCArray->szCell[i];
     assert( sz>0 );
-    if( SQLITE_WITHIN(pCell,aData,pEnd) ){
+    if( SQLITE_WITHIN(pCell,aData+j,pEnd) ){
       if( ((uptr)(pCell+sz))>(uptr)pEnd ) return SQLITE_CORRUPT_BKPT;
       pCell = &pTmp[pCell - aData];
     }else if( (uptr)(pCell+sz)>(uptr)pSrcEnd