From: dan <dan@noemail.net>
Date: Sat, 23 Feb 2013 19:11:47 +0000 (+0000)
Subject: Fix a cut-and-paste bug causing the library to fail to report database corruption... 
X-Git-Tag: version-3.7.16~34^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22d27300476e8e14ef35e0935eae4333eb259e01;p=thirdparty%2Fsqlite.git

Fix a cut-and-paste bug causing the library to fail to report database corruption in a few cases.

FossilOrigin-Name: f921df59560d536f5b80eef8c995cbe3ff591bae
---

diff --git a/manifest b/manifest
index 9a1539d2ca..4bdfea20f9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\stest\sscripts.\sNo\scode\schanges.
-D 2013-02-23T18:58:11.423
+C Fix\sa\scut-and-paste\sbug\scausing\sthe\slibrary\sto\sfail\sto\sreport\sdatabase\scorruption\sin\sa\sfew\scases.
+D 2013-02-23T19:11:47.930
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 0b8d2108a10ada00e642525921960b0c27451955
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c bcd64dff70af19e3a166853b7b728887cd4cc975
+F src/btree.c 02ab112a16517321d64660e84e0ccc06ef5f43c7
 F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
 F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
 F src/build.c 73ca65f32938e4e0d94e831b61b5749b211b79be
@@ -1034,7 +1034,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 66f9faa9a969d004486ee38d492fb3eda6cdebab
-R 87b39f8ba9e2866ed1adab1a9b990f83
+P ccab94c10d54e585de918bbf82dec188287d93b2
+R e25f1782ace53b239780abd0cb855692
 U dan
-Z c23ef7906674057cc290bb43146b99c4
+Z 0e49116a8cea889274c349c3b9506a7e
diff --git a/manifest.uuid b/manifest.uuid
index 265b085615..f96d46f468 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ccab94c10d54e585de918bbf82dec188287d93b2
\ No newline at end of file
+f921df59560d536f5b80eef8c995cbe3ff591bae
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index b46b32ffca..5952aa3a55 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -3041,7 +3041,6 @@ static Pgno finalDbSize(BtShared *pBt, Pgno nOrig, Pgno nFree){
   while( PTRMAP_ISPAGE(pBt, nFin) || nFin==PENDING_BYTE_PAGE(pBt) ){
     nFin--;
   }
-  if( nFin>nOrig ) return SQLITE_CORRUPT_BKPT;
 
   return nFin;
 }