Improved corrupt database detection in the relocatePage() routine of

the b-tree module.

FossilOrigin-Name: d57873337a2a7a0d717dc7726cd2682b5bea594d2d1ff8f16c2485161fcd6b16

diff --git a/manifest b/manifest
index 1e5c72be285f864282eb8d16c1625bff7d2e0f4d..1962ad31c1869bb9f173967f71142e3c6b1e1eeb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\scomments\sin\ssqlite3session.c\sto\sdescribe\sthe\sformat\sof\s"rebase\sblobs",\nas\swell\sas\schangesets\sand\spatchsets.
-D 2018-10-30T19:14:16.577
+C Improved\scorrupt\sdatabase\sdetection\sin\sthe\srelocatePage()\sroutine\sof\nthe\sb-tree\smodule.
+D 2018-10-31T01:04:18.766
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 64113b9c489de88bf5ea29d7426fa3f63938ee5f5e4a4fea1f6e62a25efba177
@@ -445,7 +445,7 @@ F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df
 F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 3f5e1a03db871e627bf5da21092bf7434ecfc5c5980bbd7d45eba13341340173
+F src/btree.c 75ec3352656834ed096af95410610e7e7f16e1cdb65b0876bad49387b01d21b3
 F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 F src/build.c bd47530436bcdd6c6111a44c88d6c629ebc5a6666602d1cdb9b6b26a531ee741
@@ -1774,7 +1774,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4f9878107a54356b7105fa1db7655ee239685d570436f6ad4d4221c9bd829b3d
-R 622ca62823c1f2dbd276de64ff12f603
-U dan
-Z 735b392b2384d31c91535992371336a6
+P bf93f7b56b1d15682988daf3f1c293caf755433defdecd52ba8782fc40e92bd7
+R 7440f37da8fa3f03cbd89e05264b9a76
+U drh
+Z c3131730d7f851843ceaaadec37dd802

diff --git a/manifest.uuid b/manifest.uuid
index 995f71869df7c36143342ee7ad20624728a66fde..d39072dd4eee53ca4feea3c7e0a0707370bf0499 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bf93f7b56b1d15682988daf3f1c293caf755433defdecd52ba8782fc40e92bd7
\ No newline at end of file
+d57873337a2a7a0d717dc7726cd2682b5bea594d2d1ff8f16c2485161fcd6b16
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 2fb52854747b5e566da3e61418c1b71459727e2e..b4f3d73f6865a5c589b256ab36059e6b6ffd951f 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -3586,6 +3586,7 @@ static int relocatePage(
       eType==PTRMAP_BTREE || eType==PTRMAP_ROOTPAGE );
   assert( sqlite3_mutex_held(pBt->mutex) );
   assert( pDbPage->pBt==pBt );
+  if( iDbPage<3 ) return SQLITE_CORRUPT_BKPT;
 
   /* Move page iDbPage from its current location to page number iFreePage */
   TRACE(("AUTOVACUUM: Moving %d to free page %d (ptr page %d type %d)\n",