diff options
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/btree.c | 12 |
3 files changed, 10 insertions, 16 deletions
@@ -1,5 +1,5 @@ -C Simplifications\sand\stweaks\sto\svdbeaux.c\sresulting\sfrom\sstructural\stesting.\s(CVS\s6891) -D 2009-07-14T14:15:27 +C Simplifications\sto\sthe\sPRAGMA\sintegrity_check\slogic.\s\sRemove\sunreachable\scode.\s(CVS\s6892) +D 2009-07-14T17:48:06 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -106,7 +106,7 @@ F src/auth.c 802a9439dfa0b8c208b10055cba400e82ef18025 F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3 F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c -F src/btree.c b88edecbed1c1c46b1cfcd924ac7b759c1085af4 +F src/btree.c dcdf6af667dfeae23eaf8fac7ace3caeed632c8b F src/btree.h e53a10fd31d16c60a86f03c9467a6f470aa3683b F src/btreeInt.h a568bf057aa249eb06fd31358b4393a5ac88c118 F src/build.c 867028ee9f63f7bc8eb8d4a720bb98cf9b9a12b4 @@ -740,7 +740,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746 -P 25dd342283046aaf66a679348ef1c7364c616402 -R f6226eddfcb83024fda164220a139368 +P fa49666fb913f0d82e84bdfa2af3a294be04e47c +R c96e1acc2f48a31e75ce3ac536c3155e U drh -Z 435b93aa97c763959298279012931682 +Z 197c424f91353d8f0b9f8ad4f802f46f diff --git a/manifest.uuid b/manifest.uuid index 32159a68f..f2f242ecc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fa49666fb913f0d82e84bdfa2af3a294be04e47c
\ No newline at end of file +17749fa5480069cc4909acd992ab26d10afb279d
\ No newline at end of file diff --git a/src/btree.c b/src/btree.c index fff9f90a9..4fe513dde 100644 --- a/src/btree.c +++ b/src/btree.c @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree.c,v 1.686 2009/07/13 13:18:07 danielk1977 Exp $ +** $Id: btree.c,v 1.687 2009/07/14 17:48:06 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -7340,7 +7340,6 @@ static int checkTreePage( if( iPage==0 ) return 0; if( checkRef(pCheck, iPage, zParentContext) ) return 0; if( (rc = btreeGetPage(pBt, (Pgno)iPage, &pPage, 0))!=0 ){ - if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ) pCheck->mallocFailed = 1; checkAppendMsg(pCheck, zContext, "unable to get the page. error code=%d", rc); return 0; @@ -7424,11 +7423,7 @@ static int checkTreePage( pCheck->mallocFailed = 1; }else{ u16 contentOffset = get2byte(&data[hdr+5]); - if (contentOffset > usableSize) { - checkAppendMsg(pCheck, 0, - "Corruption detected in header on page %d",iPage,0); - goto check_page_abort; - } + assert( contentOffset<=usableSize ); /* Enforced by btreeInitPage() */ memset(hit+contentOffset, 0, usableSize-contentOffset); memset(hit, 1, contentOffset); nCell = get2byte(&data[hdr+3]); @@ -7440,7 +7435,7 @@ static int checkTreePage( if( pc<=usableSize-4 ){ size = cellSizePtr(pPage, &data[pc]); } - if( (pc+size-1)>=usableSize || pc<0 ){ + if( (pc+size-1)>=usableSize ){ checkAppendMsg(pCheck, 0, "Corruption detected in cell %d on page %d",i,iPage,0); }else{ @@ -7474,7 +7469,6 @@ static int checkTreePage( cnt, data[hdr+7], iPage); } } -check_page_abort: sqlite3PageFree(hit); releasePage(pPage); return depth+1; |