From: mistachkin <mistachkin@noemail.net>
Date: Fri, 28 Sep 2012 18:13:35 +0000 (+0000)
Subject: Modify the clearCell function to use SQLITE_CORRUPT_BKPT in the one place it was... 
X-Git-Tag: version-3.7.15~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70a1b71fb64c51b33abf7f8e751c6d633ff824a0;p=thirdparty%2Fsqlite.git

Modify the clearCell function to use SQLITE_CORRUPT_BKPT in the one place it was not.

FossilOrigin-Name: 472beb306a4fa7103837d4417aef7d66eef49993
---

diff --git a/manifest b/manifest
index 6358e6d360..1dc244597a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Query\splanner\senhancements\sto\sbe\smore\sagressive\sabout\soptimizing\sout\sORDER\sBY\nclauses\s-\sin\sparticular\sthe\squery\splanner\snow\shas\sthe\sability\sto\somit\sORDER\sBY\nclauses\sthat\sspan\smultiple\stables\sin\sa\sjoin.
-D 2012-09-28T00:44:28.903
+C Modify\sthe\sclearCell\sfunction\sto\suse\sSQLITE_CORRUPT_BKPT\sin\sthe\sone\splace\sit\swas\snot.
+D 2012-09-28T18:13:35.369
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 9cf6de113d23d47967df24b8d8ce6501c879d7e6
+F src/btree.c 6e1b481435d04055eda89d24ae93ecd7a99cdf56
 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c c4555e16f8ccdadb2616014c617ed8166c5a93f7
@@ -1017,7 +1017,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 20caf80cb3b65e69a99dbc142db8ee435fb2dbdc 98b633717a1c9a08f6a1d00bc6bc891564ae7e9b
-R 4c8024fc13aa6a5fc65357b963a76180
-U drh
-Z 885caf237f331087362c9bb98b2de660
+P 1e874629d7cf568368b912b295bd3001147d0b52
+R f05735be438496d52bd0a75864235756
+U mistachkin
+Z ea13a29c0e73e27415324aa966ef2598
diff --git a/manifest.uuid b/manifest.uuid
index bdeb814a07..9dc405edef 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e874629d7cf568368b912b295bd3001147d0b52
\ No newline at end of file
+472beb306a4fa7103837d4417aef7d66eef49993
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 47dd7db99d..7eab9fe158 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5256,7 +5256,7 @@ static int clearCell(MemPage *pPage, unsigned char *pCell){
     return SQLITE_OK;  /* No overflow pages. Return without doing anything */
   }
   if( pCell+info.iOverflow+3 > pPage->aData+pPage->maskPage ){
-    return SQLITE_CORRUPT;  /* Cell extends past end of page */
+    return SQLITE_CORRUPT_BKPT;  /* Cell extends past end of page */
   }
   ovflPgno = get4byte(&pCell[info.iOverflow]);
   assert( pBt->usableSize > 4 );