Remove a NEVER macro in defragmentPage() that dbsqlfuzz discovered can be

true.  crash-32d9312f145cdce41613573f6431d9a3e439e3d7

FossilOrigin-Name: 90403759e1cf30f7c11fa8170d6df59a0dd138e1de59d2b60bec7ba15d74f67c

diff --git a/manifest b/manifest
index 6c8b53652dad4d36d940ac3f369eb22303cd3504..83955010892cb69b03512c4710d9833ff047cde8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\srun-time\soptions\sto\sthe\sspeed-check.sh\sscript.
-D 2022-09-12T16:07:24.415
+C Remove\sa\sNEVER\smacro\sin\sdefragmentPage()\sthat\sdbsqlfuzz\sdiscovered\scan\sbe\ntrue.\s\scrash-32d9312f145cdce41613573f6431d9a3e439e3d7
+D 2022-09-18T17:59:28.634
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c 138804ba7c054533573e87facdfcf9f8aa003c7123152dda8d9281f837ab2622
+F src/btree.c aad3381b25b0aa56838b35f86fbae9fb10ab8670ba130b413e6e3652cb732d74
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98
@@ -2000,8 +2000,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 73c4c68d3b4c16caf8281dabddd7365d24691e5ee2da89b1783eca66bfbd9280
-R 8caad88aec151feccca0c9cd18faaecf
+P ff46bc9d2a844dde9dafa157114f4d9ee157205ca5c08ed9ee32f018de310e62
+R aaedd7afd554c8b3f1f27bfdcfdfa93d
 U drh
-Z 5694145593725214ff362dc6756dc32c
+Z c1d90d220a23eba962b8ea9221ff1cde
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ee1e7a8414b10f3d2fe74b339554911d1cb37c71..67bee0f83db47bda730e2551b5064288343b9037 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff46bc9d2a844dde9dafa157114f4d9ee157205ca5c08ed9ee32f018de310e62
\ No newline at end of file
+90403759e1cf30f7c11fa8170d6df59a0dd138e1de59d2b60bec7ba15d74f67c
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 577de2bee2e95b8bf4f5fe33409f48ce5b57aa1e..a08ed95d140293a9c1ba83938d66e930f9bad88b 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -1547,7 +1547,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);
         }