From 291508f62b9906adf7be3058b296d56edcc5b01f Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 8 May 2019 04:33:17 +0000 Subject: [PATCH] Remove an ALWAYS() that was previously added by check-in [a0819086] but which turns out can sometimes be false. FossilOrigin-Name: ad8fc5d8b440c49df95328df0408be699dde5a1dbd195b3f1f32e5f765578032 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 2 +- test/fuzzdata8.db | Bin 1102848 -> 1105920 bytes 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 5222bb56e4..aeff91dc45 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -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 +C Remove\san\sALWAYS()\sthat\swas\spreviously\sadded\sby\scheck-in\s[a0819086]\sbut\nwhich\sturns\sout\scan\ssometimes\sbe\sfalse. +D 2019-05-08T04:33:17.529 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 fcfd6b960e56d017364e1d602145d462292ef4820662901209dc286ec0d1b7a8 +F src/btree.c 9177613eeef0fdbfcdc3f380e82c5c743a6d506bfa3faaf88077aa7104de53aa 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 bd3fe8efb575482574290939fc370e1c05be411540d641b2c5a685556a7774c9 +F test/fuzzdata8.db 7f1ad0a0cc9918529e7b16f48f2449ce6e7871babd71c79492bbe020fb3a63ae 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 a0819086a521fb0ca4ffd12f959b168a89ea2e30a2844bbbd39831b2b9ecf29b -R 4ae1172cfb69c4ca388f7f6898beb261 +P 74eba2558a81f9e790d95a12a0c5379d4f80b43c8698ef9d6a31ff8d160a53d8 +R b44cef3f4f230de0233e4f2d76b5b9bd U drh -Z 935e74436fa8db0279dd403af1580bb6 +Z 1b034307f2a838fd2dfaed7d5015e616 diff --git a/manifest.uuid b/manifest.uuid index f127cb2d5a..b4de1aec81 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -74eba2558a81f9e790d95a12a0c5379d4f80b43c8698ef9d6a31ff8d160a53d8 \ No newline at end of file +ad8fc5d8b440c49df95328df0408be699dde5a1dbd195b3f1f32e5f765578032 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 9f265d2d09..92bafffbd4 100644 --- a/src/btree.c +++ b/src/btree.c @@ -1630,7 +1630,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){ top = get2byte(&data[hdr+5]); assert( top<=(int)pPage->pBt->usableSize ); /* by btreeComputeFreeSpace() */ if( gap>top ){ - if( top==0 && ALWAYS(pPage->pBt->usableSize==65536) ){ + if( top==0 && pPage->pBt->usableSize==65536 ){ top = 65536; }else{ return SQLITE_CORRUPT_PAGE(pPage); diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index 0843ffaf12bf0e71b7d55cb329f55254a96b325f..b6440aa3cc824cc787d3980cf9685d2c9ecc3dff 100644 GIT binary patch delta 4727 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 delta 3828 zcmZ{n3shBQ7RT>C=iGbFeVp$*B#0u&MbOexE()S6ACN02YZ^gq<&;kNs+LM}Q=9As z$H&;1Aq285U!de;)Dd6oOf4x(3skN-W;z;}nVBYN=3{J}@7!E)2lTA9_geSd^L_jG z?Y+PMcTV2!L3wKi6?6z2ZnG&Vw&p9Q@PS@1d{fps6;if%v_iIh5xr1E&L&~gYf&zDB(Xc+YA4J*-rR%W~A`%n-RjlYlaJ7 zVulGn&oqReY3jmHGd;pjHeJGxH=V*iGb`FPH`)clBw?~JMVMWfLzpT|6Xq0VJ?9qY zp=g(W*3=~16&sAVT`AfW_M^JmZ#os*K`hHq24d;6dS}XdTQ6^mnFpi@98f0Bpm!?t zNT=PU*w(f$+VpIH`f0l!F4-pvh8K#$CbpyKo%#h)v^kAJG)2RZ1! z=?ur5YOMhCX2}jTUesL3Zt0ik;P?7Ffc^IBd%?fZ?`lKY5-S4A+onwgjH%Yoz>D;h zgRKJ0+pamNV!u9If~lC%-FX^~!P=XY6VT5&>>kDTYkvWiLd8e*nc$qh<6+aS*sk*6 zy%ERsbzsjHpf6!ul9q0f9s`O!sh-LHMq1eh$r3_QM9 z?~JtzwSJVgPxs5{cCc=WnDG_dMB4qB=#7(SaI;2a8=c1ZQ2Z;kdI z>22As0CUick?+NfT$x*Z@j#>7vsDuOjT%qs9IR3{0|qPCDTp%{8_(!DRt=j$=Svpo zo7i|x&&0eAE^ia;mF7xD2Z#Ti8h^H?52AY;bOUH$H+EXJ8;WhkR8c=4j_k?uwYL}e zO|ICMTMgP1y}ek9^R4X;lPR`KVOEu`Wlpxw5@F|)lFV+YkdO7*n*I8ONm`wmEM1QgCX5|nj%kU2R7rDN}*ymgiQm4mRy#z(%U*h@_Fm{wP5=)LI%og^qnZ=L&oN-SnaH7!E1{nS5YwS-kA z>R`O+(Za|*hNS{6UBwzc3@n!uaX}W?@!Lc>mY&?n*2}Pw%=h&Ku_1@(DkWC2!xB_rpc)d< zw-y{&kRm@p`Fq%O6*gn_EJ&fgHS9|nwqVXA5!=&Wehp*K$R}xffaOcD6${f{k<{TZ zJ1a}uyhVTL*qwSFWdYe;nVQ@;IXPvVFUg06?;G84Z81zLIptVF15dC$5)dhMEZga5 zr`WEKNx`ra#zU9^N^i{BB6~1zCFIbgbF3Kbo5boq#B{Hohz0qOiUs{(J+-~SE=aHg z>z>rTn46$i)5QiBF2hbtzsf$wJY9VjbFQ;KH0BChA;B&zd)g6&b=N(Av~G{4z1P?V z)zx0HotTtzOI#Q@EhTN+$TMX7b`ftkj(Nq=eM?376F_xac_dVJ(Z&V$Z556=1<%tI zA1{>EvAz3>hd;qFEA26uwV7|ES`Y6f!>2`oq4C&bo*GY&_u*S)wRg|n;=w%__6v-s z=fnA889u}MEIFC_wByw>e2(57Yyf7+s!l_r`BoYBV&*B$iy2?3<+RVsXKN5ek9Xyp zCHu!>rZ0=k@W0U52Y8tb)o4a*L(n^ub+WLEWvHR557mJ{X*%B(RHXey>G55fcq(N$ zfQ_5fSFyp)AHgO2jCUz3g0Ga|U?@{Ua+p;hvF^bVw-iO0j2z9aQ#pdW5%@1=Lx}l7L#7()m!qy=iCM_ z>7p&P6zfNcs|JP*@0^Mh7%jt%z1PiQPQ z8nF93HNk4ov%#C^F|G}d!)|+xBk1eL5li1tC(zYx+#|sS40}dsN$n+YVa8P{0Y%&H z$BIXwCuME7vhy<*24I@iyH5cf+QpM3xQLnO)R(ZdGoOs2gGbXUFD;94<<7|E{0z@u|rIQ+yIB@zlsPx6q=k{5k9BnPDB~)FFm&2 zc*qF}l)ugJOLptiuX|Ba#Nno+a;<1(aU9{TwtTQPwg<+&>k7XuuywnPcnK0|lZRIZ zS%*mA!@yfw%zonfH6XXWDI*4>4Ij?N;}i#ww@sg{zj(x?H