Detect when database corruption causes an attemp to set the pointer map

value for a pointer map page and report the corruption. (CVS 6722)

FossilOrigin-Name: 3ae4880bee3a0312c61cdd36f4fa50286cc2ef48

diff --git a/manifest b/manifest
index c9823bc6269acae16b40c0e3e7f735cda5b6f0fe..4c1fc95ef4044ce4baa8f195cbbb6e292b06696d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sleftover\s"breakpoint"\scommands\sfrom\stest\sscripts.\s\sAlso\sremove\sblank\nlines\sat\sthe\send\sof\sscripts.\s(CVS\s6721)
-D 2009-06-05T17:09:12
+C Detect\swhen\sdatabase\scorruption\scauses\san\sattemp\sto\sset\sthe\spointer\smap\nvalue\sfor\sa\spointer\smap\spage\sand\sreport\sthe\scorruption.\s(CVS\s6722)
+D 2009-06-05T18:44:15
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/auth.c 98db07c2088455797678eb1031f42d4d94d18a71
 F src/backup.c ff50af53184a5fd7bdee4d620b5dabef74717c79
 F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119
 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
-F src/btree.c 3a0e52943bf32aba524e3811f4bea0a2e59b078f
+F src/btree.c bb9dbeaf781544314e181ffe81275a7db31acb30
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c 20e02fd72249159ff6829009f3029d16d59cdff5
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 302ab855e62dfae8507800302dae479e0494b81a
-R 4568e1a1009bbdcd7607100a9fc9e1d9
+P 1fef16ec2b89981770cf44f606a420fbe031a7a4
+R 731fb18497d10f8868219b8baf21403e
 U drh
-Z ae8efcdbc0613ff6c4c5083b0d8de41f
+Z b3f6798c73dec5beaf284b9c4bf80ed6

diff --git a/manifest.uuid b/manifest.uuid
index 47fab653fcc7bb0aef5b9fff5102cf1031a9a033..a9a6c3a2eb197442d09ce34da8e8756e84421854 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fef16ec2b89981770cf44f606a420fbe031a7a4
\ No newline at end of file
+3ae4880bee3a0312c61cdd36f4fa50286cc2ef48
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index c113f6d4672564caecb5d774ecc4d21d4ed95c11..78af5fc776cd355c70a2aa8cd5336b6e21cc980f 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.618 2009/06/05 14:17:22 drh Exp $
+** $Id: btree.c,v 1.619 2009/06/05 18:44:15 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -584,6 +584,9 @@ static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){
     return rc;
   }
   offset = PTRMAP_PTROFFSET(iPtrmap, key);
+  if( offset<0 ){
+    return SQLITE_CORRUPT_BKPT;
+  }
   pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage);
 
   if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){