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 zc-nQC4SW>UwZQkx%x}MPuQa-G zy~60i^`DFcuAed}*Z*S>uBRJLt|NxR_0+k^%KT&nxCmTCE)o|j7aJEl7nzHLi#gB9 z#l?~pa@tTt%hMK!ST0zeu4zb^E#m`*B3U+tutg_Rx_ES5_vUmnEc25oIH%c_h-1&%#?VlpeUeZ2pz$OL zVrDM%Oo-jgDIeAKpzh@+usT3;(6ftRF%ozXjsqJqv0YxGl&IgBr-^u?2AT2 z`FcqA=sq5THx%%3ONGUHI8+!iCx-QC$QQ-bE3Oo5x{m}Cv!l^$^FkK)aSbFG#fDZ_ z9(XZ4jr8ae;8#7N>ySY`P?U{jpSd!+dD=(JkL+R|Wh9Eb#*^fMHzM~a3YWD(^g?ows~6Y@!YV&J1Ls)jVd?tqX+n4 zVRppyR%~7~YnzdwjJjuZ?u60qyT<<4=t=HE_qeg{nVvy~!-@vqrrb65UL5kK;Kb%! z>rgVtUF04X89ZW8cv#_JtjeU1)o6}HLHsR_KPYs=JL-fvY{?puy0E)u$J(JP*#)hNDr1=Prel4G4|lMWHqn@9}vHQ#~2v|GqCK6BN0pY%T-u0SG1w_ zn5-Z@Pukd_PskF$+qaWp40%V*dosW?6Zq}0gtl>FO#)^729MRtKUQJ z6<`+TWjIcuHb!2+O81hlY*r#!z8}G%0&M94@<(vY-aguJNtTOhY;3|o@(Nf>Ip`cr z^~kv<=}}-Qhsh~`-(hZvoX#HjmaK_EhXnXN=9bByv;+DDcmj`Y=l#{VOun7v>>y<# zIxmwU61VsyHZXZ87F;G1*}P^_F2Wxe{N3SzcDyoRwlB%QB&b+BO$IC-Cr@Hi&XAV{ zFtF?%+0D*=KoVk^;ts0i*G#_`;Ey*`^LD%6N5FJB*Gx|h;D}vhCgU7G0L){DT8Kx$ zoJC?X8~-B-+N@NvoQb6bYX;J6c3GlU(OS-LpUh^`vP&hVDK^G+-n9(o=S8f@FDV1`j~TNdsu5T(!8&&?L($^O4|1_dptO zRBp2ws$^+PxDn=~)~C6}#Y`GRuiBv+TT<1oEJ>%|*rA3^olRfm&g+%a?8TqaVt}Ps zwp6*Ybp#bfScYZKDxYD>L&|L|Etj?ku$+~xRNe(lnc_&o+WVd3m+w@v*l)+sWgwuR zrT(B)il~0+C^3V07R%Ns`%s@CO04m2dcqD}*ro|IPjoHeSDz0BeI9RC7P{XP`(o`? zX$t1-lU`+^2k2_MwVPylE1yR&0IgxV%=+Rp=|&=36{fspU#RYHbj5K+v>u+@8lj>D zt5|L?K?dgfZ+cOHS~Py?Ovl|VFcaT=jNXH#2ke7cQVIP=fI8f>+uq2Il+sK)tj40~nnYeZOssUJBev4Usmi-70ea%zk|N814Fk2)kXm_MWEv@;3yV~*)qxso1b5reK0 zU@dEDbEW|5$}P&_b}j#LfQ&_XJ!?OkY6D1ytudU2N@gnh)>_*8R;n#l%`I!Uk;oP+7>h`^QDt zh$F|)Oswy&xRyU9HZiS^F0w-pd|@4Z#JXwY6eEeb*30%j1`%Fm+6mWCV3}L!5dk)1(|*WAeLdK)Dj-f|m9Nvs z?XU&+&xHWX-c8>XVJntSgCul~5TC%5FT@k<@x8QC0EX4MN)qe6kDeBV*WEQg@0-EA z2WXS%+!pd@`~CbO?a{G%g*F7&FNJB#PufkjVlZy5faEn{(nIJIzTRpt=YFRd=egJ)6>;z(OwwL=0kfi zyxQ6a3)ZTewlu0f5&mA&G_D^GUuf^gemzXxEZT$KAfNXRCVU4G_OPrzFTy@-DG>cE z%cbrY;UDPUMDM^n(N5SnO?^#-cX9kl*^PPc+t;vtiRwHVdb3~mQC}6TZ*fcS)fkDt zVTEqBPK1MKB+GZ9dlpSIsg{axi0yg9J`z|Cs5@huQDaSRzX9z$TSaKX)&~3U@!Tc) z3tYKFTfqt(>S_TF$1}a(iRnl@)9q@TY)iIUjAuu%JtgXGf+NB`9pLg2)>)l;T<%zH znpy<#aVOAEkb{20j_0WZL^#?J@>nOx2TaKSi-$ZO4_RPBo`{ExsOM$q!*-OYqXg@R zoULWEkvQ*WNyD*{p2V`{+S_c^0&O3#s#)p`fX^^@t$J`-qgu%d=9pejb)@_J)+ziV zp6<&|DLfrdw@BryEQQ^%RGkgVR|onSeLJSJnakJcnXc~NT#@+Hb?)T@xOSpTdbYKjD_}eGnUh_ z!LyiZS5tAwcI`vdbrrGp5B6eqalPsi;2b7Q<(o)j8z`7}QAkG~-FsO73-Gdnjb_lT zSlt9O%@7|1cDOz4&M5@%6Iecexge*bn24t zJGS%1juNlfrg1Dw2P_HV zuzF}5OX!4k!Nd};WBp)aN%1Xm#cUC4e2aX{8<=hPXrlz1_%H55?umdVWv)GC z`APd&{B)a^&DS>qdt-~{;jc44!W~$@Si4so>=}%y)9fj%@9Wwz(X=!Kjrn%|uB)pP zSoun_om$QgICz)tO;z+Xm&yVS#?nOpM*h!kYQ3)EMDZQ83%5csP>!jodJ kcFLW=gm*Q`ZX3Y!{Ct1pd47TEf6)#AmOo7AoA+n_8|a-5KmY&$ delta 3828 zc-nQB3se>57RS$?nR8~&W4;-ZhYH9+z|vAcKy>8;a^=msT|sT-Exmz{YKbH#v75bM z6t7(~gh00C3xs@J^$Mu$OerZ!3LjuzGrby^nVBYH=Hpu4Z%&3M(6iS5uf@!K-~R2# zx0%V^H8OYI$bw+MaTbe|V7c`RExa!d##NY0(ftb2a2*BZG!W??5QVp_O9g<~z zkD{ulhtUt)Re!-coijXF>UppPRVjv^IjW&MBM<^ zOb+@2hQ}(&Cg~BNu;c1UfWKpMrV>eiy{1-pp%Vpo5tBX2R~>-y0?fgqyVWRcTA~c4 zqz2U^qSMCuNqonbu!@v>G0nyvqr9_fjtDOkd}_Bt2c8GWc2WIBf>+mMD1cdGlnFHP zs=8Ky*U&Roant!$)z6zL?x0ZFYWlqdIk!?%-{E&Um@ae8^b`ROYgDs|b6f#1X#Y7i zR=}i1VhE)=*dUu#l`QAHDZ!#RHiWL}%qm)6;mh*~n(bo%lMcvkj9I6=Luw%V8DKsd zq2k?`k|Sy+Uj)#k9&C*O|DX#eR1N+J=uJ#-FU|tIa7xYkBj_T*yz@F^0(vTsRdeT+j?=Vq6q^Q6 zh@N7{^_tO46yYuOEOmT?Vb3`3r{0gURso90v)u7HVAw=^5SBjfOf9K(45sJCvLzrC z$5Z$fN4|*KclJy(h$ZN$a5P}dcu}IJ3GBEGezZA_rHHP@{O;1kL2 zvdLgw#kXIJbqTH@iYaC}0%{AKE?TpiO#)blWgj~ynpou`tjDH9j)lbC&lcfdIASb| z#>zm4t7N{|O!_9aNQNL>v6W4?Zrn7{2qf1wc2Tgd;oEOQcu?$%yO=hMO5bBsMEEy0 zuM(qiaT-|h>u52I9^c6}im;iCchyLKAV;e*Mc1)|0#ssiBSd4&daz+Zg7_Ha*R$C& zRAb{jNT4Bm*ykc_!K@7K+civl1;b8>$7yym%NJlP7A8A_DEJ^dEehM*MStqmp9UUg z&7!j=F@8vVe8QBN*cdE)SMP`Giy@=rgl##EIL7J)Ad*^Grrp+EvRqA1K)+-91DFER zAk5k#x-hpKvMA#WD+X&7kM4a;cB|1?kPnGiFcdaY;5l|qfF0QKxa!87NVSp9w=sVa zc4G2n_95n~^3#}gl?|r!OKi0OwOIC~ttYlzb^Y1AJc)K+VVh(}56N;YBjE=BVe?5L zcH3qxMYL|`{&r#dOSb-7D*Yb=YT2peYI-A`XS%x^CH9lZ#4Nn ztxSYQG(wco=$^}Zn^?sn?4i2%jk)QGSTFI34dW1Cfb2$whL zZ&O-;RxZGPU#6xmOwGPb4{7a+E!b)?mJXx3Iokb#eJc0#8MlL2W_8B+B#%l5Xj1_G z(*^Vpa?r2n*hH<52w!%FJlq9xnhE)pFXRzl$QdT&QD4X`?V7y($xxdG{0Bs$nC}J2E z1ZtoC76I}ID$Ltwur8ZDg1K>8E+$oL`_1N@?CpmiP+z9EVgH44q#4X<@5Qqi-c1X~ ze!KNU7&BBuEPYL$Mwho~E&? z6F>)QwO9epW9k|C1uTuyW+3n2@woU)*`Jcac@NjrYka6*xI>?`cj=Rhog4b6&c(QN z`(pg;Ta3#c#Zc(s7Hzu-SA2_c((IM6o4wM;o&4_(eAm11{nDB5*Uo%5y6}O{`7Ag2 zB%SktZ?h;mZx-Q?e2Gr$HU5Ha?aI|t=Ug^luAfXUxf7S9_;6h}x$L*+a`)(m1;748A7Y+x1bV+t zkLB+*zrt{=T&9l``^5Ie@C-SOde!SkMRTjW(O4k!m)@b;c*-f&^F+7@Q{U5$(a}A6 znD>dkl)6*P1j=aE7kg{duLJ&WdSs*ifE^+!f1B1ckO^^X4m`_k>Y5;3~d9@=4O4o0P*Pes@Sswvld7=q)W0bif4LR6!J{3 RpqLtc4`5C