From: drh <>
Date: Mon, 11 Oct 2021 09:39:42 +0000 (+0000)
Subject: Fix an over-zealous assert().
X-Git-Tag: version-3.37.0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd789f9bd9971b387ab87944d2283584fbfd35fd;p=thirdparty%2Fsqlite.git

Fix an over-zealous assert().

FossilOrigin-Name: e2bb82a4095427eb810903180fa27fb85b52144bdcfe33388352638428d017f5
---

diff --git a/manifest b/manifest
index b94362e6ee..86c2ed2b62 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Detect\sany\sattempt\sto\suse\san\sINDEXED\sBY\sclause\son\sa\sCTE\sand\sreport\san\nerror.
-D 2021-10-09T16:00:56.047
+C Fix\san\sover-zealous\sassert().
+D 2021-10-11T09:39:42.548
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -490,7 +490,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 7c07979ab50dc15e0c3f967897543ce09743b1d11377f10f9dd4a2fd0ec3e0e4
+F src/btree.c 472cc43a2631d9bd917475e0a0ab43949ae27c8541473a90b55c51011f6121cc
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c 46df621d2426fe04494ad83d86d2edb5f79f6a14a4595981e4de2502f172794e
@@ -1928,7 +1928,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 b8c9a54664a87ac464b413390572c3feb912e1efc9c8a78c61f1b370e2165c05
-R 0dfb0bb10d05f6bb20b43b31156cbd37
+P 35a9de2c97b9a386070e7827a0842bb1caf3af69ea0d6f67ce2a50be3426fb63
+R 06629d80390d3bfc787a4a109d27b763
 U drh
-Z 963494934ee8a982a3213d8ade04cfb3
+Z 8447ffb286f0a97c5704ea348d708c3f
diff --git a/manifest.uuid b/manifest.uuid
index 2490396299..a5f7dc2034 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-35a9de2c97b9a386070e7827a0842bb1caf3af69ea0d6f67ce2a50be3426fb63
\ No newline at end of file
+e2bb82a4095427eb810903180fa27fb85b52144bdcfe33388352638428d017f5
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index f5d9996749..8b7f1137c8 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5085,7 +5085,7 @@ static const void *fetchPayload(
   assert( pCur->eState==CURSOR_VALID );
   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
   assert( cursorOwnsBtShared(pCur) );
-  assert( pCur->ix<pCur->pPage->nCell );
+  assert( pCur->ix<pCur->pPage->nCell || CORRUPT_DB );
   assert( pCur->info.nSize>0 );
   assert( pCur->info.pPayload>pCur->pPage->aData || CORRUPT_DB );
   assert( pCur->info.pPayload<pCur->pPage->aDataEnd ||CORRUPT_DB);