Fix a segfault that can occur when running integrity_check on a corrupt db. (CVS...

FossilOrigin-Name: eae959ede1b2b50190c60de9249cf141c3031ce2

diff --git a/manifest b/manifest
index 2cbaa1b6dfa294298226620a727f9fcd02d1ba5c..232f344a24ef35a173a3241821de9008c4c839dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sthe\ssector\ssize\sis\sgreater\sthan\sthe\sdatabase\spage\ssize,\sSQLite\sjournals\sall\spages\sthat\slie\swithin\sa\ssector\sbefore\swriting\sto\sany\sof\sthem.\sThis\schange\sensure\sthat\sa\sjournal\ssync\sdoes\snot\soccur\shalfway\sthrough\sjournalling\sthe\sset\sof\spages\sthat\sbelong\sto\sa\ssingle\ssector.\s(CVS\s5605)
-D 2008-08-25T07:12:29
+C Fix\sa\ssegfault\sthat\scan\soccur\swhen\srunning\sintegrity_check\son\sa\scorrupt\sdb.\s(CVS\s5606)
+D 2008-08-25T11:57:17
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -96,7 +96,7 @@ F src/attach.c db3f4a60538733c1e4dcb9d0217a6e0d6ccd615b
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d
 F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53
-F src/btree.c 9253ac92b434a5a556cb65cf67b9c101205bfdf2
+F src/btree.c f6a1f698b1625da624457d25436e1a639631ffb3
 F src/btree.h 6371c5e599fab391a150c96afbc10062b276d107
 F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576
 F src/build.c 160c71acca8f643f436ed6c1ee2f684c88df4dfe
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P a323bd29a600abddbcc2cc9961ab84d82cccc5e5
-R 0ab2c5661f3a3767448c6b94f28dc844
+P 16f612d61e00938f29ecae4ebfe598be7a8709a8
+R a1b7813883cc372930b535631e98f790
 U danielk1977
-Z 7c29baa12ffe3b5de5f7f54f640152f8
+Z a2e4405583d55f95054203654010ac3f

diff --git a/manifest.uuid b/manifest.uuid
index 7bf56d44a358a4aa82868820bbe98f2d29514dfa..939f1c5c65d83d35e2c097fb38a763c745e9e145 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16f612d61e00938f29ecae4ebfe598be7a8709a8
\ No newline at end of file
+eae959ede1b2b50190c60de9249cf141c3031ce2
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index bbcd0822b9a82c488dbb4fe654e992c75abb61d4..45184c422a21c1d870d0468efe08332a2575fb85 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.502 2008/08/23 16:17:56 danielk1977 Exp $
+** $Id: btree.c,v 1.503 2008/08/25 11:57:17 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -6758,8 +6758,11 @@ static int checkTreePage(
     cellStart = hdr + 12 - 4*pPage->leaf;
     for(i=0; i<nCell; i++){
       int pc = get2byte(&data[cellStart+i*2]);
-      u16 size = cellSizePtr(pPage, &data[pc]);
+      u16 size = 1024;
       int j;
+      if( pc<=usableSize ){
+        size = cellSizePtr(pPage, &data[pc]);
+      }
       if( (pc+size-1)>=usableSize || pc<0 ){
         checkAppendMsg(pCheck, 0, 
             "Corruption detected in cell %d on page %d",i,iPage,0);