From: drh <drh@noemail.net>
Date: Sat, 4 Jan 2020 14:50:06 +0000 (+0000)
Subject: Back out another NEVER added by check-in [7b62555e285f32d3] - the test case
X-Git-Tag: version-3.31.0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2b61bb61f4fd7d57a8469cb5a706166e0a0a40e;p=thirdparty%2Fsqlite.git

Back out another NEVER added by check-in [7b62555e285f32d3] - the test case
was already in test/fuzzdata3.db, but it only occurs if compiled without
SQLITE_ENABLE_PREUPDATE_HOOK.

FossilOrigin-Name: 61f873b14c2c835f3d10b018b357cb8b1f041e97e05709d7ab5a8055e5e05349
---

diff --git a/manifest b/manifest
index 525daac33c..31c0e65bbf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\somit\sflag\sfrom\seq\sconstraints\son\scolumn\s"aggregate"\sof\sdbstat\svirtual\stables.\sFix\sfor\s[727074e2].
-D 2020-01-04T14:00:56.513
+C Back\sout\sanother\sNEVER\sadded\sby\scheck-in\s[7b62555e285f32d3]\s-\sthe\stest\scase\nwas\salready\sin\stest/fuzzdata3.db,\sbut\sit\sonly\soccurs\sif\scompiled\swithout\nSQLITE_ENABLE_PREUPDATE_HOOK.
+D 2020-01-04T14:50:06.248
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -469,7 +469,7 @@ F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 71f8faded1395642655c7687425deffa2ab400ffb7ebcf49c70a0f2b2c98932d
+F src/btree.c 615294ab54a0f6970bfb17f97638ecbf1c0b8d475e2ea46e691cbdf11d3493a1
 F src/btree.h 6111552f19ed7a40f029cf4b33badc6fef9880314fffd80a945f0b7f43ab7471
 F src/btreeInt.h 6794084fad08c9750b45145743c0e3e5c27c94dee89f26dd8df7073314934fd2
 F src/build.c 67b1a8d3ac700747687dbdc49ded847a3c17fef450a8c919ac0399b44cbd4215
@@ -1853,7 +1853,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 04a05c83f58784df438dc6614f7920f782bf7c1ed4f6d101c03b6573cfde06ee
-R 1703a219aa94e72ff53f11786410e2a6
-U dan
-Z e4e649c3518bb901cfaf8c3de6dc2721
+P 74ef6f2b6d9f50ff1d455e2263ba77707c1e8394b25b3f8a3a2a7b6e7f2c481e
+R 00853aee1212d0420ad20ab38f5e6163
+U drh
+Z dee11d0a89f768d79a08911387920f9c
diff --git a/manifest.uuid b/manifest.uuid
index 96ee6100d7..4bfdcaf77f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-74ef6f2b6d9f50ff1d455e2263ba77707c1e8394b25b3f8a3a2a7b6e7f2c481e
\ No newline at end of file
+61f873b14c2c835f3d10b018b357cb8b1f041e97e05709d7ab5a8055e5e05349
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 3774ad1dcd..9c42d33755 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6951,7 +6951,7 @@ static int rebuildPage(
     u16 sz = pCArray->szCell[i];
     assert( sz>0 );
     if( SQLITE_WITHIN(pCell,aData,pEnd) ){
-      if( NEVER(((uptr)(pCell+sz))>(uptr)pEnd) ) return SQLITE_CORRUPT_BKPT;
+      if( ((uptr)(pCell+sz))>(uptr)pEnd ) return SQLITE_CORRUPT_BKPT;
       pCell = &pTmp[pCell - aData];
     }else if( (uptr)(pCell+sz)>(uptr)pSrcEnd
            && (uptr)(pCell)<(uptr)pSrcEnd