From: drh <>
Date: Fri, 9 Apr 2021 22:34:59 +0000 (+0000)
Subject: Remove a NEVER() in a corruption detection conditional in allocatePage().
X-Git-Tag: version-3.36.0~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d78fe4e1a4a92f95b5c74db153bf748c2474cc8c;p=thirdparty%2Fsqlite.git

Remove a NEVER() in a corruption detection conditional in allocatePage().
dbsqlfuzz 9c61c33802600b2b01dfb09b0386ceb4ade02a19

FossilOrigin-Name: c174f5d32b8c6bbad102065b2d5acae70ddb153f863a2842da836cf7db3f683f
---

diff --git a/manifest b/manifest
index cfe6e3d9b5..937b244fe9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sALWAYS()\sthat\sis\sactually\sreachable\sfollowing\san\sOOM\son\san\nUPDATE\sFROM\sof\sa\svirtual\stable.\ndbsqlfuzz\saa03237ef7c4a028c7cdaf8bbcde2b62e2bcd36e
-D 2021-04-09T22:20:20.951
+C Remove\sa\sNEVER()\sin\sa\scorruption\sdetection\sconditional\sin\sallocatePage().\ndbsqlfuzz\s9c61c33802600b2b01dfb09b0386ceb4ade02a19
+D 2021-04-09T22:34:59.206
 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 223f8a50e050f510942d3591c5c55aed7b2d0944370245b47c3c0a295e9b239e
+F src/btree.c e8eaf65959e80b42ad362774bfce56488e7c9990b4d21d0e7e1888f1c53adf49
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c 3a63a0dd142e238247fba0c20d6321ef1a8917de7814657ad279a02d2ff6da78
@@ -1912,7 +1912,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 09c96b4c026746f285a8aef5199bd247ecca590095ee42dde4f4dfa4996ce0bd
-R 5c43dd4043e1a7a66c55a9040596d360
+P 49eac38926b3391b185d20fae6588c213f7f020f028173d4a4aa3c7a62b94140
+R 253f8e41be3d6474ba65322885577c09
 U drh
-Z 4a95bf68f015f799d9f5c1fe598c06fb
+Z 7f95a72e3dcecb729648e898c816bd07
diff --git a/manifest.uuid b/manifest.uuid
index bb55599eb9..33d995a8fc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-49eac38926b3391b185d20fae6588c213f7f020f028173d4a4aa3c7a62b94140
\ No newline at end of file
+c174f5d32b8c6bbad102065b2d5acae70ddb153f863a2842da836cf7db3f683f
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 2ad0135319..8d4196363a 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1489,7 +1489,7 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
           if( iFree2+sz2 > usableSize ) return SQLITE_CORRUPT_PAGE(pPage);
           memmove(&data[iFree+sz+sz2], &data[iFree+sz], iFree2-(iFree+sz));
           sz += sz2;
-        }else if( NEVER(iFree+sz>usableSize) ){
+        }else if( iFree+sz>usableSize ){
           return SQLITE_CORRUPT_PAGE(pPage);
         }