Add NEVER() to a branch that became unreachable with

check-in [58f36af2271517ab].

FossilOrigin-Name: e07ce463967521ab53463b21f80c8f90c337c15c250f69c3fccc1305f54f32df

diff --git a/manifest b/manifest
index 6cce0c29695d1b956ab3f94c0ce7eac42e8c8c96..311e666df88cc4301f36802289eeb3f75fbf28ff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sinvoking\ssqlite3Atoi64()\swill\sa\snull\spointer\sfollowing\san\serror\nfrom\sExpandBlob().
-D 2021-04-10T15:34:30.503
+C Add\sNEVER()\sto\sa\sbranch\sthat\sbecame\sunreachable\swith\s\ncheck-in\s[58f36af2271517ab].
+D 2021-04-10T20:21:28.690
 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 e8eaf65959e80b42ad362774bfce56488e7c9990b4d21d0e7e1888f1c53adf49
+F src/btree.c 247c9874a9f670a8138e7e53ef25310cdc807b45eecf57f9ef0dc31357a789be
 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 40852ca8e215e51f63652a67817361b835b6fbbff7f66af50089af91007505f1
-R a5a7974c5f4c4887902bb85878f4741c
+P 780412f2ca7576ce90861b2bd499f953504125b200e9aeae685def4a943f9d2b
+R 2c2537e0d5fdc23230401c16f4536a4d
 U drh
-Z fdb85dc855d6f7931ee561366a3c79ad
+Z d56a50ed8fb3b4a9111d6668c3b3a16b

diff --git a/manifest.uuid b/manifest.uuid
index bb87e65f4a92e7d84a910895f77322bee81f7083..16e7091a01c6122d57967eaf405e408898a6cdf5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-780412f2ca7576ce90861b2bd499f953504125b200e9aeae685def4a943f9d2b
\ No newline at end of file
+e07ce463967521ab53463b21f80c8f90c337c15c250f69c3fccc1305f54f32df
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 8d4196363a9b217f0d85516b13cbe88cb1a09b55..00b180c257fb662da818b78ddb3a35c11127db45 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -8834,7 +8834,7 @@ int sqlite3BtreeInsert(
   assert( pPage->intKey || pX->nKey>=0 || (flags & BTREE_PREFORMAT) );
   assert( pPage->leaf || !pPage->intKey );
   if( pPage->nFree<0 ){
-    if( pCur->eState>CURSOR_INVALID ){
+    if( NEVER(pCur->eState>CURSOR_INVALID) ){
       rc = SQLITE_CORRUPT_BKPT;
     }else{
       rc = btreeComputeFreeSpace(pPage);