Fix an assert failure introduced by (6355). (CVS 6365)

FossilOrigin-Name: a08324d16d1e9a4e7c1b294bc71fc939d173f826

diff --git a/manifest b/manifest
index 7887ffb4551bd4edbfc62c3d6d58b65a502bd709..ecbe33ea32cdbfbb1c69f724ee51c9124ecc4fae 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sstruct\sWhereClause\sis\saligned\son\san\s8-byte\sboundary.\sFix\sfor\s#3613,\s#3736.\s(CVS\s6364)
-D 2009-03-20T14:18:52
+C Fix\san\sassert\sfailure\sintroduced\sby\s(6355).\s(CVS\s6365)
+D 2009-03-20T14:42:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -204,7 +204,7 @@ F src/vdbe.c f8164c2830f82714a77b1f2a97c2e9c4efbcb3bb
 F src/vdbe.h d70a68bee196ab228914a3902c79dbd24342a0f2
 F src/vdbeInt.h 53a2f4696871712646c77351904576cca6ad9752
 F src/vdbeapi.c 025d83f51f5e0a6e0fb55d603103d24825577967
-F src/vdbeaux.c e9b76cf2ca8f78b692be984381cc4b27defc902a
+F src/vdbeaux.c 8b3ce0123c7622544bbad1e7fbedac79ed436e84
 F src/vdbeblob.c 3408f5e1ab62627300b9c9c3168cff1de65e1658
 F src/vdbemem.c 543a79d722734d2f8b7ad70f08218c30bcc5bbf5
 F src/vtab.c 18d671f0a45d0159088070bc6b219a3105034c87
@@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 19fa5a29b97f017a9e176e48c848100299ba6920
-R 7488665d9a2cafa9025a5fd3b2a16baf
+P 093a0cf4adc8613f744c2ccdef61f0b30a46818c
+R 8085b31e0c8618fcfa2324af9c4bb501
 U danielk1977
-Z 7d097ac4987cc470b6a73e382cea7d80
+Z ead312bd28ad877405ab99a1bca5833f

diff --git a/manifest.uuid b/manifest.uuid
index 770f993086c0df109822d39a44ff905157676be3..3526b6921cdc6ae6c2c1737259b606ae8cb8ca3d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-093a0cf4adc8613f744c2ccdef61f0b30a46818c
\ No newline at end of file
+a08324d16d1e9a4e7c1b294bc71fc939d173f826
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 5402acdbd2b073bca0afcbf05b9ad1ae2b00934c..8ff424517df436d05a2c65fe68c6e8695fd0f254 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $Id: vdbeaux.c,v 1.443 2009/03/18 10:33:02 danielk1977 Exp $
+** $Id: vdbeaux.c,v 1.444 2009/03/20 14:42:11 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -1575,11 +1575,11 @@ static void invalidateCursorsOnModifiedBtrees(sqlite3 *db){
 ** Otherwise SQLITE_OK.
 */
 int sqlite3VdbeCloseStatement(Vdbe *p, int eOp){
+  sqlite3 *const db = p->db;
   int rc = SQLITE_OK;
-  if( p->iStatement ){
+  if( p->iStatement && db->nStatement ){
     int i;
     const int iSavepoint = p->iStatement-1;
-    sqlite3 *const db = p->db;
 
     assert( eOp==SAVEPOINT_ROLLBACK || eOp==SAVEPOINT_RELEASE);
     assert( db->nStatement>0 );