From: drh <>
Date: Sat, 25 Feb 2023 15:34:09 +0000 (+0000)
Subject: Remove an unnecessary and redundant corruption checks in defragmentPage().
X-Git-Tag: version-3.42.0~320
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20e09ba6a863835175c3276da305965ec66fd998;p=thirdparty%2Fsqlite.git

Remove an unnecessary and redundant corruption checks in defragmentPage().

FossilOrigin-Name: 2dc7342e12e9dac2d8345d045a17caa29c26eaf6f417dd052c7c645eddd6c58c
---

diff --git a/manifest b/manifest
index b61275760d..9c0eef5077 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Revert\s(mostly)\sto\searlier\sCLI\sresponse\sto\s-echo\sand\sSQL\sat\sthe\scommand\sline.
-D 2023-02-25T15:15:40.203
+C Remove\san\sunnecessary\sand\sredundant\scorruption\schecks\sin\sdefragmentPage().
+D 2023-02-25T15:34:09.046
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -560,7 +560,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 2f012aea074de6319c191cbf5c45034de79bf1c762826e381b1cf75421d8d831
+F src/btree.c ff9634e33c27a77a49d430e32f2aa6a16502632376a6f0b65bcf12e09d7ca4d2
 F src/btree.h aa354b9bad4120af71e214666b35132712b8f2ec11869cb2315c52c81fad45cc
 F src/btreeInt.h 06bb2c1a07172d5a1cd27a2a5d617b93b1e976c5873709c31964786f86365a6e
 F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
@@ -2046,8 +2046,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 4430e6e96dbf3d0b464776c132838dd3e456716e0ae5972fc7e0ece13b56ea25
-R 8941207ab3042353d14f49547d95d3a0
-U larrybr
-Z 0509b1c3c7307441d1eefcb8a2685f24
+P 1c6cfcf6ed5e084e5eb6874a261f3670ab5fb3e5dbcf150f37c58b2f16351ee3
+R 6f0a4ee3eb90075db6e6500bcbce2e80
+U drh
+Z 9c68161318f8714b2adb3b454cee5391
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index edb26eb4d4..5a09b45c8e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1c6cfcf6ed5e084e5eb6874a261f3670ab5fb3e5dbcf150f37c58b2f16351ee3
\ No newline at end of file
+2dc7342e12e9dac2d8345d045a17caa29c26eaf6f417dd052c7c645eddd6c58c
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 4fbe0b3dbc..2f6ab428b6 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1580,10 +1580,10 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
       /* These conditions have already been verified in btreeInitPage()
       ** if PRAGMA cell_size_check=ON.
       */
-      if( pc<iCellStart || pc>iCellLast ){
+      if( pc>iCellLast ){
         return SQLITE_CORRUPT_PAGE(pPage);
       }
-      assert( pc>=iCellStart && pc<=iCellLast );
+      assert( pc>=0 && pc<=iCellLast );
       size = pPage->xCellSize(pPage, &src[pc]);
       cbrk -= size;
       if( cbrk<iCellStart || pc+size>usableSize ){