From: drh <>
Date: Thu, 16 Mar 2023 09:07:46 +0000 (+0000)
Subject: Remove a NEVER() from btreeNext() that dbsqlfuzz 460aa158f9a2c41145831cc924296cde1f312b3f
X-Git-Tag: version-3.42.0~256
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5531316dd030b320c5653454bc2dcec23bf261b2;p=thirdparty%2Fsqlite.git

Remove a NEVER() from btreeNext() that dbsqlfuzz 460aa158f9a2c41145831cc924296cde1f312b3f
found could sometimes be reached.  I will find a way to test that branch
later.

FossilOrigin-Name: 1dffeffe150fff6777cf26bc960326ca4e4190d25d05bb066b082d1e1c8eb374
---

diff --git a/manifest b/manifest
index ea75ce9552..100d6872ee 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disallow\sthe\sone-pass\soptimization\sfor\sDELETE\sif\sthe\sWHERE\sclause\scontains\na\ssubquery.\s\sFix\sfor\sthe\sproblem\sreported\sby\n[forum:/forumpost/e61252062c9d286d|forum\spost\se61252062c9d286d].\s\sThis\sfix\nis\smore\srestrictive\sthan\snecessary.\s\sIt\scould\sbe\srelaxed\sif\sthe\ssubquery\sdoes\nnot\sinvolve\sthe\stable\sthat\sis\sthe\ssubject\sof\sthe\sDELETE.
-D 2023-03-15T17:58:51.689
+C Remove\sa\sNEVER()\sfrom\sbtreeNext()\sthat\sdbsqlfuzz\s460aa158f9a2c41145831cc924296cde1f312b3f\nfound\scould\ssometimes\sbe\sreached.\s\sI\swill\sfind\sa\sway\sto\stest\sthat\sbranch\nlater.
+D 2023-03-16T09:07:46.644
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -564,7 +564,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 c547e099f853de61835ff45da8d956a932d02ecf1ffd472a1f2a103b83e6dd40
+F src/btree.c 9192990bb78806df33ac680df47cb4100b5dbe5d298c3d0abffc82cd31ca6634
 F src/btree.h aa354b9bad4120af71e214666b35132712b8f2ec11869cb2315c52c81fad45cc
 F src/btreeInt.h 06bb2c1a07172d5a1cd27a2a5d617b93b1e976c5873709c31964786f86365a6e
 F src/build.c 4fed662d383527c808d85f53b9c544ead425ac8b9c7cb38501a64e3797921d41
@@ -2050,8 +2050,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 4c4e66f293d7768cceb875a936ca0f4cd910473e20b9910698cc1e1ce221a7d4
-R 934d92c186df99d22e77975c034c41b7
+P 73f0036f045bf37193b6e87ae45b578c5831614c530488257c69666178da3aa5
+R 416ca2e38e88837ddad74173b91b3e6d
 U drh
-Z 54012e32e8462771957ea3ef7763a915
+Z 476a952efa83c3a1b612460afea7cd08
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cea5ff8945..7a6660030a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73f0036f045bf37193b6e87ae45b578c5831614c530488257c69666178da3aa5
\ No newline at end of file
+1dffeffe150fff6777cf26bc960326ca4e4190d25d05bb066b082d1e1c8eb374
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 210845eeb6..918388a64a 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6132,7 +6132,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
 
   pPage = pCur->pPage;
   idx = ++pCur->ix;
-  if( NEVER(!pPage->isInit) || sqlite3FaultSim(412) ){
+  if( !pPage->isInit || sqlite3FaultSim(412) ){
     return SQLITE_CORRUPT_BKPT;
   }