Get the SQLITE_SECURE_DELETE compile-time option working again.

Ticket #3050. (CVS 4999)

FossilOrigin-Name: 40ba51fd4c621e29e7ff85495b1212c92f06ab31

diff --git a/manifest b/manifest
index 0d918e314de75c47b773fe9e6336ac2fb6575049..68fcb0ac49cfdeeb43a46f3b0eb05eee576821f7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbuild\serrors\sin\stest_osinst\s(CVS\s4998)
-D 2008-04-13T23:13:40
+C Get\sthe\sSQLITE_SECURE_DELETE\scompile-time\soption\sworking\sagain.\nTicket\s#3050.\s(CVS\s4999)
+D 2008-04-14T01:00:58
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -84,7 +84,7 @@ F src/alter.c b42d782906fc3b92c331efbe06e9389617b47ce7
 F src/analyze.c 9ee63497ee720728abe630d169ab91323ac7519c
 F src/attach.c bdc75e759ca25a16f4dc7fbdbc6d37ad2561bb24
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
-F src/bitvec.c 49817d442e51e4123585f3cf3c2afc293a3c91e2
+F src/bitvec.c 8ec2212cfb702bc4f402c0b7ae7623d85320c714
 F src/btmutex.c 483ced3c52205b04b97df69161fadbf87f4f1ea2
 F src/btree.c ee340ad90103fe70526f7b0c3728d185dd470f20
 F src/btree.h c66cb17c6fffa84a88926dbef173bab4ae692fd4
@@ -128,7 +128,7 @@ F src/os_unix.c fdec4e5ee5dd555a6ad4a69f38ab35f0788536b4
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 3a60bddd07ea6f8adb2314dd5996ac97b988f403
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 7b302d90674ea411d0856057af9699fe003318e3
+F src/pager.c 1cd9efd9fcd0342b9b9d3a0e8eff13e830ca5926
 F src/pager.h b1e2258f03878c14b06a95bfa362e8c5c9638170
 F src/parse.y bc1b1cc6f86a0e0b669abdd88ddbdc7c8b67318d
 F src/pragma.c e659c9e443d11854cff2fd250012365ae0ca81ba
@@ -156,7 +156,7 @@ F src/test9.c 4615ef08750245a2d96aaa7cbe2fb4aff2b57acc
 F src/test_async.c 3147c64c34721f088d5ab20f85dabd5d7732c007
 F src/test_autoext.c 5e892ab84aece3f0428920bf46923f16ac83962a
 F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
-F src/test_config.c 097a49a8804815799dc3d2220e6af693ad54f59d
+F src/test_config.c b910754c5ba311abf149457cdbfd66144e715b35
 F src/test_devsym.c cee1aecaa90c895030399ca4ae38f84a08038f8a
 F src/test_func.c ef4ef3230b6346031bca2762bbc8b95ec7e0451a
 F src/test_hexio.c 1a1cd8324d57585ea86b922f609fa1fbaaf9662d
@@ -407,7 +407,7 @@ F test/openv2.test f5dd6b23e4dce828eb211649b600763c42a668df
 F test/pager.test 60303481b22b240c18d6dd1b64edcecc2f4b5a97
 F test/pager2.test c025f91b75fe65e85febda64d9416428b8a5cab5
 F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
-F test/pageropt.test 51e3c091bc2992f5098f7576e3594e1908988939
+F test/pageropt.test 6df72c441db0a037b7ec6990d16311c24fbea77b
 F test/pagesize.test e0a8b3fe80f8b8e808d94a00734c7a18c76c407e
 F test/pragma.test aec802c9599db3ec887b5fd96f0b08958129303e
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
@@ -628,7 +628,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 7622d74ad6088de4d94cb727b60ac4a042c52016
-R eb34257922f461833483dfdf628f3806
-U mlcreech
-Z 95c5da5972df7da80d15bd9b995f9b6f
+P f047399799798e693ef75c472144f30a0175b662
+R 848996a4f6f1ddd4b94f81b02d93b615
+U drh
+Z 06e5004f2421fc62b11ad23f6ebe7551

diff --git a/manifest.uuid b/manifest.uuid
index 96a49669656b0c8dc7aecf00771fdba277a8a6b2..023541ca27739d5e944bbea46c1128c724352a69 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f047399799798e693ef75c472144f30a0175b662
\ No newline at end of file
+40ba51fd4c621e29e7ff85495b1212c92f06ab31
\ No newline at end of file

diff --git a/src/bitvec.c b/src/bitvec.c
index be8f4d6d16092ea5094df351fe843664d2b92b8a..c8b8e200bcc835bcccd5304ffa2db6e7ec0ff622 100644 (file)
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -32,7 +32,7 @@
 ** start of a transaction, and is thus usually less than a few thousand,
 ** but can be as large as 2 billion for a really big database.
 **
-** @(#) $Id: bitvec.c,v 1.3 2008/03/21 16:45:47 drh Exp $
+** @(#) $Id: bitvec.c,v 1.4 2008/04/14 01:00:58 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -130,6 +130,7 @@ int sqlite3BitvecSet(Bitvec *p, u32 i){
   u32 h;
   assert( p!=0 );
   assert( i>0 );
+  assert( i<=p->iSize );
   if( p->iSize<=BITVEC_NBIT ){
     i--;
     p->u.aBitmap[i/8] |= 1 << (i&7);

diff --git a/src/pager.c b/src/pager.c
index e5f3c9799acfd3847cccbb20498c8ed6e02fb8ab..900f8042c598a9ab882a89dd764e7223a155a80d 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.423 2008/04/03 10:13:01 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.424 2008/04/14 01:00:58 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -4434,19 +4434,6 @@ void sqlite3PagerDontWrite(DbPage *pDbPage){
 ** the PgHdr.needRead flag is set) then this routine acts as a promise
 ** that we will never need to read the page content in the future.
 ** so the needRead flag can be cleared at this point.
-**
-** This routine is only called from a single place in the sqlite btree
-** code (when a leaf is removed from the free-list). This allows the
-** following assumptions to be made about pPg:
-**
-**   1. PagerDontWrite() has been called on the page, OR 
-**      PagerWrite() has not yet been called on the page.
-**
-**   2. The page existed when the transaction was started.
-**
-** Details: DontRollback() (this routine) is only called when a leaf is
-** removed from the free list. DontWrite() is called whenever a page 
-** becomes a free-list leaf.
 */
 void sqlite3PagerDontRollback(DbPage *pPg){
   Pager *pPager = pPg->pPager;
@@ -4464,8 +4451,17 @@ void sqlite3PagerDontRollback(DbPage *pPg){
   }
   assert( !MEMDB );    /* For a memdb, pPager->journalOpen is always 0 */
 
-  /* Check that PagerWrite() has not yet been called on this page, and
-  ** that the page existed when the transaction started.
+#ifdef SQLITE_SECURE_DELETE
+  if( pPg->inJournal || (int)pPg->pgno > pPager->origDbSize ){
+    return;
+  }
+#endif
+
+  /* If SECURE_DELETE is disabled, then there is no way that this
+  ** routine can be called on a page for which sqlite3PagerDontWrite()
+  ** has not been previously called during the same transaction.
+  ** And if DontWrite() has previously been called, the following
+  ** conditions must be met.
   */
   assert( !pPg->inJournal && (int)pPg->pgno <= pPager->origDbSize );
 
@@ -4474,7 +4470,7 @@ void sqlite3PagerDontRollback(DbPage *pPg){
   pPg->inJournal = 1;
   pPg->needRead = 0;
   if( pPager->stmtInUse ){
-    assert( pPager->stmtSize <= pPager->origDbSize );
+    assert( pPager->stmtSize >= pPager->origDbSize );
     sqlite3BitvecSet(pPager->pInStmt, pPg->pgno);
   }
   PAGERTRACE3("DONT_ROLLBACK page %d of %d\n", pPg->pgno, PAGERID(pPager));

diff --git a/src/test_config.c b/src/test_config.c
index 1045dcda5ca12cd4ef7140f727df8e796119c0ca..a82f5af113e71f95d3ad0c0ab39b961a22b7cd43 100644 (file)
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -16,7 +16,7 @@
 ** The focus of this file is providing the TCL testing layer
 ** access to compile-time constants.
 **
-** $Id: test_config.c,v 1.24 2008/03/22 01:07:18 drh Exp $
+** $Id: test_config.c,v 1.25 2008/04/14 01:00:58 drh Exp $
 */
 
 #include "sqliteLimit.h"
@@ -419,6 +419,12 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double",
   Tcl_SetVar2(interp, "sqlite_options", "vtab", "1", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_SECURE_DELETE
+  Tcl_SetVar2(interp, "sqlite_options", "secure_delete", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "secure_delete", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #define LINKVAR(x) { \
     static const int cv_ ## x = SQLITE_ ## x; \
     Tcl_LinkVar(interp, "SQLITE_" #x, (char *)&(cv_ ## x), \

diff --git a/test/pageropt.test b/test/pageropt.test
index 41f3d5cb1097af68b2108c0e6f7bbf411c056cac..3ab1ff5ccdd6dfcf76a3cfeb88e41300dacd8d66 100644 (file)
--- a/test/pageropt.test
+++ b/test/pageropt.test
@@ -12,12 +12,12 @@
 # The focus of the tests in this file are to verify that the
 # pager optimizations implemented in version 3.3.14 work.
 #
-# $Id: pageropt.test,v 1.3 2007/08/12 20:07:59 drh Exp $
+# $Id: pageropt.test,v 1.4 2008/04/14 01:00:58 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-ifcapable {!pager_pragmas} {
+ifcapable {!pager_pragmas||secure_delete} {
   finish_test
   return
 }
@@ -188,7 +188,7 @@ do_test pageropt-4.1 {
 # reads total.  But only page1, the t1 root, and the trunk of the
 # freelist need to be journalled and written back.
 #
-do_test pageroot-4.2 {
+do_test pageropt-4.2 {
   db close
   sqlite3 db test.db
   pagercount_sql {