Fix a reference count problem following database corruption detection in

the ptrmapPut() routine of btree.c. (CVS 6854)

FossilOrigin-Name: ec1e27e33b89e809a03e4140b351f6c8674c0233

diff --git a/manifest b/manifest
index f868d02777ca78fdbce8a1a148ae3824f4af74c0..de5b765911a63af6412046cd6ac324178185cfb3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplifications\sto\sbtree.c\sand\svdbeaux.c\sin\ssupport\sof\sstructural\scoverage\ntesting.\s(CVS\s6853)
-D 2009-07-07T02:44:07
+C Fix\sa\sreference\scount\sproblem\sfollowing\sdatabase\scorruption\sdetection\sin\nthe\sptrmapPut()\sroutine\sof\sbtree.c.\s(CVS\s6854)
+D 2009-07-07T11:39:59
 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 efad7a5ac6c460aa326de8df290e72af54b2a96e
+F src/btree.c 8f4c2ebdc9f0e0139f5878fac8ac96b12528b014
 F src/btree.h e761619e76a1125d2d82bd3613b5a7ac7d1ee6f7
 F src/btreeInt.h b31e5ac04181c7e2892c33ab06228c551df6233c
 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 31a5e8192e164f01c5d7c2744b67cfb517251fad
-R 100495e4081a84deef5f1cdee7a55f95
+P fc2a40a9db23285da16f40f5131613907fb80f02
+R 067e52bffc46b1e850298e3bb4524f93
 U drh
-Z 8f0c5bdca0336a3f4c49fe6be74bffd7
+Z fdbf1e48a2965ae7334046f98d17d69c

diff --git a/manifest.uuid b/manifest.uuid
index f29584bbc248647c44869d486813eaa5882b68d2..ecce359e4dfd4b26d51c2f27fe1564b62a9be127 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fc2a40a9db23285da16f40f5131613907fb80f02
\ No newline at end of file
+ec1e27e33b89e809a03e4140b351f6c8674c0233
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 10d06c0ec20a938bca1c38dd3f70bcf3d974fe0d..67753f363e75ea0da8f1eabff4bd8dad089e53ab 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.654 2009/07/07 02:44:07 drh Exp $
+** $Id: btree.c,v 1.655 2009/07/07 11:39:59 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -740,7 +740,8 @@ static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){
   }
   offset = PTRMAP_PTROFFSET(iPtrmap, key);
   if( offset<0 ){
-    return SQLITE_CORRUPT_BKPT;
+    rc = SQLITE_CORRUPT_BKPT;
+    goto ptrmap_exit;
   }
   pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage);
 
@@ -753,6 +754,7 @@ static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){
     }
   }
 
+ptrmap_exit:
   sqlite3PagerUnref(pDbPage);
   return rc;
 }