From d2cfbea2a4ce631957554e480e90b711ef681249 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 8 May 2019 03:34:53 +0000 Subject: [PATCH] Remove a NEVER() that was added in the previous check-in because it is in fact reachable. FossilOrigin-Name: 74eba2558a81f9e790d95a12a0c5379d4f80b43c8698ef9d6a31ff8d160a53d8 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 2 +- test/fuzzdata8.db | Bin 1099776 -> 1102848 bytes 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index cbd5fdce9a..5222bb56e4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Earlier\sdetections\sof\serrors\sin\sthe\sbyte-offset-to-cell-content\sinteger\sat\s\noffset\s5\sin\sthe\sheader\sof\sa\sbtree\spage. -D 2019-05-08T00:17:45.328 +C Remove\sa\sNEVER()\sthat\swas\sadded\sin\sthe\sprevious\scheck-in\sbecause\sit\sis\sin\sfact\nreachable. +D 2019-05-08T03:34:53.523 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -461,7 +461,7 @@ F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df F src/backup.c b1d37f6f7f5913944583733ed0f9e182f3ece0d42c27f46701142141a6e6fd33 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 -F src/btree.c 3fe1f1b3cd623a0cad788dfbd90ce200c3d522d608ae688fc8ee002d59924414 +F src/btree.c fcfd6b960e56d017364e1d602145d462292ef4820662901209dc286ec0d1b7a8 F src/btree.h c11446f07ec0e9dc85af8041cb0855c52f5359c8b2a43e47e02a685282504d89 F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f F src/build.c 23e9332b260cd0e45f6cbfabe711957a0776ea3ff836746378868fdfa64d267b @@ -1001,7 +1001,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7 F test/fuzzdata7.db 2b13f8d7a4e475f164c733e64c9ebc459424ec58d0876ef103de62c1a99e2fca -F test/fuzzdata8.db 1786362da75b8696f804b0b4548b59830e148718bce827548c006031105e7783 +F test/fuzzdata8.db bd3fe8efb575482574290939fc370e1c05be411540d641b2c5a685556a7774c9 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536 @@ -1824,7 +1824,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 3c75605b4652ae88659465d832953ac9d467369f9cb417f73b3d8599ec60b18b -R b0847795ba7312dd769390f52a23c18c +P a0819086a521fb0ca4ffd12f959b168a89ea2e30a2844bbbd39831b2b9ecf29b +R 4ae1172cfb69c4ca388f7f6898beb261 U drh -Z 9c745365e239320fd6fda1cfdfad4d1f +Z 935e74436fa8db0279dd403af1580bb6 diff --git a/manifest.uuid b/manifest.uuid index 67413b6578..f127cb2d5a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a0819086a521fb0ca4ffd12f959b168a89ea2e30a2844bbbd39831b2b9ecf29b \ No newline at end of file +74eba2558a81f9e790d95a12a0c5379d4f80b43c8698ef9d6a31ff8d160a53d8 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 42867168ea..9f265d2d09 100644 --- a/src/btree.c +++ b/src/btree.c @@ -8068,7 +8068,7 @@ static int balance_nonroot( assert( sz<=pBt->maxLocal+23 ); assert( iOvflSpace <= (int)pBt->pageSize ); insertCell(pParent, nxDiv+i, pCell, sz, pTemp, pNew->pgno, &rc); - if( NEVER(rc!=SQLITE_OK) ) goto balance_cleanup; + if( rc!=SQLITE_OK ) goto balance_cleanup; assert( sqlite3PagerIswriteable(pParent->pDbPage) ); } diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index 9ab060369920df286d1b89915830bc61b4916132..0843ffaf12bf0e71b7d55cb329f55254a96b325f 100644 GIT binary patch delta 5758 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 delta 4631 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 -- 2.47.3