From: drh <>
Date: Tue, 2 Jun 2026 13:44:21 +0000 (+0000)
Subject: Remove a NEVER() that is actually reachable.  This same NEVER() was removed
X-Git-Tag: release~12
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=0851e6a4feb04fa2378d5bde47126c2933110ecd;p=thirdparty%2Fsqlite.git

Remove a NEVER() that is actually reachable.  This same NEVER() was removed
from trunk at check-in [0de3d95500b7ecd4].

FossilOrigin-Name: 46e74947f155199f5ce2440e8d5f19849d0daeb1d9d47381b0f84388901eab4c
---

diff --git a/manifest b/manifest
index e6d7045ae5..4e2ac9b887 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\stransitive\sWHERE\sconstraints\swhen\sthere\sare\sexplicit\sCOLLATE\s\noperators.
-D 2026-06-01T18:07:44.560
+C Remove\sa\sNEVER()\sthat\sis\sactually\sreachable.\s\sThis\ssame\sNEVER()\swas\sremoved\nfrom\strunk\sat\scheck-in\s[0de3d95500b7ecd4].
+D 2026-06-02T13:44:21.252
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -674,7 +674,7 @@ F src/auth.c ebec42df26b34a62b6750d30d9c2c03554a1c522020182476f7729a439fef04f
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 F src/bitvec.c e242d4496774dfc88fa278177dd23b607dce369ccafb3f61b41638eea2c9b399
 F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea
-F src/btree.c b699db0283d6a68f9ebafc8559a63c40eb1b3fdeed3e448c8d8ba3a648c914a2
+F src/btree.c 377b98fbe170ae38298a3fcea5355ec88404f63238f80741992cda765ac91aeb
 F src/btree.h e823c46d87f63d904d735a24b76146d19f51f04445ea561f71cc3382fd1307f0
 F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886
 F src/build.c 8581de0af3b6c448f5d64e2d18a91ac1e7057b3bcb8b8827e1240f80d87486a4
@@ -2198,9 +2198,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 5ceba3fe8d9fb2b1e44a048b6e010d427b7f464b727b58824a2af1b53d57f1ec
-Q +18ee3a17c589cfd34500b6a6547d0cb51aea4dd14b4e1e4b2d0cf0dbfb32378e
-R efb476f2dd13a8f5e05df48686e926f1
+P 4c0455efe57d1e3c27327e942a1509de3eb7b0902bc3b90473e2cba8df90139b
+R 14c268820e8475568c33473b72a882db
 U drh
-Z 6e37514e385a146b4e0673a6db0f81b9
+Z 72720f8bcf018c13d516ed36dbb636da
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b6d4d2f722..8c59dda39d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4c0455efe57d1e3c27327e942a1509de3eb7b0902bc3b90473e2cba8df90139b
+46e74947f155199f5ce2440e8d5f19849d0daeb1d9d47381b0f84388901eab4c
diff --git a/src/btree.c b/src/btree.c
index 56a826ef69..2e53a86179 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1646,7 +1646,7 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
   ** reconstruct the entire page.  */
   if( (int)data[hdr+7]<=nMaxFrag ){
     int iFree = get2byte(&data[hdr+1]);
-    if( NEVER(iFree>usableSize-4) ) return SQLITE_CORRUPT_PAGE(pPage);
+    if( iFree>usableSize-4 ) return SQLITE_CORRUPT_PAGE(pPage);
     if( iFree ){
       int iFree2 = get2byte(&data[iFree]);
       if( iFree2>usableSize-4 ) return SQLITE_CORRUPT_PAGE(pPage);