Remove a NEVER() from btree.c that could occur in a very obscure tested
evaluation with an I/O error on fstat(). FossilOrigin-Name: d5861d9ffecca499d79d722b5f742ffe3a5aff44
This commit is contained in:
parent
e2e5145441
commit
313aa5735a
24
manifest
24
manifest
@ -1,5 +1,8 @@
|
||||
C Fix\san\sincorrect\sassert()\sin\sfts3.c.\sAdd\sfurther\sfts3\stests.
|
||||
D 2009-12-03T17:36:22
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA1
|
||||
|
||||
C Remove\sa\sNEVER()\sfrom\sbtree.c\sthat\scould\soccur\sin\sa\svery\sobscure\stested\nevaluation\swith\san\sI/O\serror\son\sfstat().
|
||||
D 2009-12-03T19:40:00
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -108,7 +111,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
|
||||
F src/backup.c 744e98359dfc79fed43e8dec911e33e108b06aae
|
||||
F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
|
||||
F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
|
||||
F src/btree.c c13f6d1a469f7bac963fff7f17980919acd5f3ee
|
||||
F src/btree.c e6f7c7bbb1a888fdf1a2c5b83a4efebf2dc13326
|
||||
F src/btree.h 7944a9dac59eb3e541aad45fd2747f1051e7c63d
|
||||
F src/btreeInt.h 54f4245decd0409ea52cf9aee422d3d761d7ac10
|
||||
F src/build.c a48e74d24897100017d39ceba5de255e53ec9488
|
||||
@ -776,7 +779,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||
P 37495b55ffbdc2db4482367ac7d8e32d4d71d58e
|
||||
R cfd8087616225b6f440fa1c8b43bd349
|
||||
U dan
|
||||
Z bf00a60fa922c646641246a97c22e493
|
||||
P 75863c2d55e0801add5b8dcf88d575c5c870af04
|
||||
R 2b7a161eaee6afd6b881b53584d9aa6b
|
||||
U drh
|
||||
Z da696b30584703ae55e60b117c5da01a
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.6 (GNU/Linux)
|
||||
|
||||
iD8DBQFLGBQToxKgR168RlERAiGTAJ9mUJN1i4Ic+WSNCIGMUesT59i0xQCeONoR
|
||||
J6K+b4rPUbkVZNhiJY2wehI=
|
||||
=sv5f
|
||||
-----END PGP SIGNATURE-----
|
||||
|
@ -1 +1 @@
|
||||
75863c2d55e0801add5b8dcf88d575c5c870af04
|
||||
d5861d9ffecca499d79d722b5f742ffe3a5aff44
|
@ -2346,11 +2346,8 @@ static int newDatabase(BtShared *pBt){
|
||||
int nPage;
|
||||
|
||||
assert( sqlite3_mutex_held(pBt->mutex) );
|
||||
/* The database size has already been measured and cached, so failure
|
||||
** is impossible here. If the original size measurement failed, then
|
||||
** processing aborts before entering this routine. */
|
||||
rc = sqlite3PagerPagecount(pBt->pPager, &nPage);
|
||||
if( NEVER(rc!=SQLITE_OK) || nPage>0 ){
|
||||
if( rc!=SQLITE_OK || nPage>0 ){
|
||||
return rc;
|
||||
}
|
||||
pP1 = pBt->pPage1;
|
||||
|
Loading…
Reference in New Issue
Block a user