Detect corruption in the form of the sqlite_sequence table pointing to the

wrong type of btree.

FossilOrigin-Name: 525deb7a67fbd64726c89d5cc36a54b090111e31239431efeeb2bda9836828e0

diff --git a/manifest b/manifest
index 4853d707ed65f14fa2095a195e812b073c5587ba..2eed7d4ead24d6e9417da640de4dca3fe314b4bf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Detect\sdatabases\swhose\sschema\sis\scorrupted\susing\sa\sCREATE\sTABLE\sAS\sstatement\nand\sissue\san\sappropriate\serror\smessage.
-D 2018-03-16T20:23:01.801
+C Detect\scorruption\sin\sthe\sform\sof\sthe\ssqlite_sequence\stable\spointing\sto\sthe\nwrong\stype\sof\sbtree.
+D 2018-03-16T23:59:36.251
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -558,7 +558,7 @@ F src/update.c a90a32ffc0100265b0693dbbdbe490756447af181f5ea2c138cce515b08c8795
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
-F src/vdbe.c 88d8e0797bf49624d056014f34f302a7370cc119915cc0ece8f2b7bf5e7c30fb
+F src/vdbe.c 066a4e1de2ed83e253adfd2e97a684cf562eaa41d31ee7f3d3e4c8aea4485a55
 F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
 F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
 F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
@@ -1712,8 +1712,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 1774f1c3baf0bc3d83a53c52702696ff21814fa1de07cc38fd098832e6757b09 e13993cf833423eec5f94082cee7213b2d97bcf40dddb2683cf5a8ebf50a33e3
-R a2c5b8eddcb12d3bb2fe3e3879b722e7
-T +closed e13993cf833423eec5f94082cee7213b2d97bcf40dddb2683cf5a8ebf50a33e3
+P d75e67654aa9620b9617786553a002f54e8c6dcbbcc58948a06bd98a0916d75a
+R f10ec81e9dd7a9fb3bb6a420e0c1ce3e
 U drh
-Z 374d2eb65795866b294a2545ae7eea24
+Z 47544520ddc0ffb0778dcedfa74bdb17

diff --git a/manifest.uuid b/manifest.uuid
index 1f593da4e98b2561b736b015e8147a041b1ed028..d56f7038a24228d1ca5a973ce5b3c3198d2b2b06 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d75e67654aa9620b9617786553a002f54e8c6dcbbcc58948a06bd98a0916d75a
\ No newline at end of file
+525deb7a67fbd64726c89d5cc36a54b090111e31239431efeeb2bda9836828e0
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 4a506dd592ddcc34d97996bb511338bf597f073a..70537ce114b116e49bce47728936c21deceed109 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4287,6 +4287,10 @@ case OP_NewRowid: {           /* out2 */
   pOut = out2Prerelease(p, pOp);
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   pC = p->apCsr[pOp->p1];
+  if( !pC->isTable ){
+    rc = SQLITE_CORRUPT_BKPT;
+    goto abort_due_to_error;
+  }
   assert( pC!=0 );
   assert( pC->eCurType==CURTYPE_BTREE );
   assert( pC->uc.pCursor!=0 );