Fix two faulty assert() statements btree. (It was possible for the assertions

to be false given a corrupt database file as input.) (CVS 6872)

FossilOrigin-Name: 9403f04dfdabdd2ba9adb1a91ca9b400cf4ca6b3

diff --git a/manifest b/manifest
index 2ecd2ee74402ae1c2f244cfdd27e60f3cbab7bb1..f84695654f201c7b75a3fe6aee1489e05bb4739b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunused\sbranch\sfrom\sbtree.c.\s(CVS\s6871)
-D 2009-07-09T11:36:02
+C Fix\stwo\sfaulty\sassert()\sstatements\sbtree.\s\s(It\swas\spossible\sfor\sthe\sassertions\nto\sbe\sfalse\sgiven\sa\scorrupt\sdatabase\sfile\sas\sinput.)\s(CVS\s6872)
+D 2009-07-09T13:25:32
 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 58c2d32d82521bfb0975eb9de936751c5f060124
+F src/btree.c 0c58f7879b6439d2acd5c37b19c754873ffb9e5e
 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 3190eefd5f5285a5250d6f4729f109852fdb02ab
-R 26fa2e36001b4aeac1337702b829bda3
-U danielk1977
-Z e2462ad1ac863731e895fe504c00340e
+P 45efb78a8a1e01a0154153b10469bb34d6d129eb
+R 312eb19d05ae6f242619e437dda1112d
+U drh
+Z a56b6692cd4d8a5d3fbce96abbee444b

diff --git a/manifest.uuid b/manifest.uuid
index f98dfcf160c4929177d86c07fbaad7e640ab0772..5b3a77549aa5742e758921f696514820cce87968 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45efb78a8a1e01a0154153b10469bb34d6d129eb
\ No newline at end of file
+9403f04dfdabdd2ba9adb1a91ca9b400cf4ca6b3
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index f2b749485463fa4bf85c8780db5eb572a2b78e0a..fb8038748acb94ea3ea99610d64f21772adaccdb 100644 (file)
--- 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.671 2009/07/09 11:36:02 danielk1977 Exp $
+** $Id: btree.c,v 1.672 2009/07/09 13:25:32 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -1075,7 +1075,7 @@ static int defragmentPage(MemPage *pPage){
       return SQLITE_CORRUPT_BKPT;
     }
 #endif
-    assert( cbrk+size<=usableSize && cbrk>iCellFirst );
+    assert( cbrk+size<=usableSize && cbrk>=iCellFirst );
     testcase( cbrk+size==usableSize );
     testcase( pc+size==usableSize );
     memcpy(&data[cbrk], &temp[pc], size);
@@ -1126,7 +1126,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
   assert( pPage->cellOffset == hdr + 12 - 4*pPage->leaf );
   gap = pPage->cellOffset + 2*pPage->nCell;
   top = get2byte(&data[hdr+5]);
-  assert( gap<=top );
+  if( gap>top ) return SQLITE_CORRUPT_BKPT;
   testcase( gap+2==top );
   testcase( gap+1==top );
   testcase( gap==top );