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 zcmZ{o349bq*1+d=_ssOnbX9jGA%P@hfPiwDo-30mM#J_R|}0~O?ZJz&U3w0~1?x~sZg z{p-C~ue!UoZgB1MgX_|h?s7Pkh~vtUxv*~t?%Ghc+O1B7rBts(>NWMa1WW5TB-Pa4 ziT;r-~}oY6`6`c#Yx3Q#Z5(};-O;S=Mx29?Trt*L_@)R(~Ms_ zOfz7bUOG4Fpwj>*9nt*$@?g*mT)rh9kJycLgs3iY;>F?uNKFr4))6v;iE3Neb!JsL z7WRkUy(4i_bGhk?lHku(=FfG(eB74Ix=XP?id`H$t zij`yFLp~@iXvV!Ip?Ex6YDS4V6bP8X+=@_;EW*1$6*l~!rC`%-ER-HFV=*(HZ!5{O z^_r2WNqr(-o8U*SAKpHU4S@(IrLmiRmn>$tmt)H?)}?o)nSinT(FCf@N^eQT%*!L* zP^B5Bi(oXjG-yXFzLv&1cc+@%NVqf*&yUh+UN}@5sPdN3X;r{14TkJ)xb3v7vlNaa ze8SV?c@>w99=7f4Eg^54rSumLnYK|XL%~2em`6sbu+@}bYAwIi8VH4R17XuP8BH%- zW%u`%*ubSWXywm3yd_vOnkB2{aWWcN3cIGW6qQbGhm~SrKI_;m6tDVu@>EG}VY(zW zbYUL>GmL(dU5B;Pn6J=VVn%=V8r^E!_5a-(w8zN{2jitNv%E4d5URR@nNW@gGuS{c zg;qj;oNVzK@8Y9tJKF8x@QzH@H{T49p7MMO1^U@xTWZG4Sd^wr(HM-9iK(_#kUN6G zieR8LP=O6cdEc>g9kQKehI4c6bLwF`jvNvs%SB3qu@DUq4A~wFR@fd3hG<@7{vd@` zywsjXFhaxAAN{KGEAvXrsdvc4*m+kfnkSSDJT>0MmFxWFehi#Y(i4~1_=((CZdaA= zrTpOlNO3^QrVU9xa4#;gKyj?a;wA1uxNkly;n8e0k6D8ni zo^ADL9+hw)i0hMBCgfppvsNO7^D(wjz7|g(<2PY}TXtf>jjWRzh~|c=PY?@Rw2dmI zp?oR>gwm{ClwqK#{a!l+IO!w42%Cp7znGE6dH}98+(Yd2H3(}jXrr-qfaDRC$F&tQ z6ksi|AXXpZQC#tXc87TRgckCGBu;&+8Q|0=7qn-(t;Yar`JhC#qc6#c)=y^9?KfQM?0!K z&bCY>iVfAQJ2qA`X6NupLeww?(Co`I3-9|u>n&b;gw3MZbjYQm;g~j_ zqT+
;EZ^e)E*t>vb?`s3_hWo_WBWx9jUGK24 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 delta 4631 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 aWS(E@h;o;DnSy_|_5;qFDi%8Lcl|fv*&d|;