Reorder some tests at the beginning of sqlite3_step() to work around

misuse by python.  Ticket #2732. (CVS 4492)

FossilOrigin-Name: e8d591e8c369794921a4acbba5b17fddca730ee7

diff --git a/manifest b/manifest
index e5e80b059399909c222855c7ed7fc0c2f92c8241..c8d3ccbf3a594bbe4e08710442f02ccee1c03b20 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\scosmetic\schanges\sto\sbtree.c\swhich\s(we\sare\stold)\sworks\saround\sa\sbug\nin\sMSVC++.\s(CVS\s4491)
-D 2007-10-16T19:45:30
+C Reorder\ssome\stests\sat\sthe\sbeginning\sof\ssqlite3_step()\sto\swork\saround\nmisuse\sby\spython.\s\sTicket\s#2732.\s(CVS\s4492)
+D 2007-10-17T01:44:21
 F Makefile.in 75b729d562e9525d57d9890ec598b38e1a8b02bc
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -167,7 +167,7 @@ F src/vacuum.c 38745037c63246d1b0669038257890cf89fc4578
 F src/vdbe.c 57e37b55c4dcdc9ed71c57180cee514c33d0e8f9
 F src/vdbe.h 03a0fa17f6753a24d6cb585d7a362944a2c115aa
 F src/vdbeInt.h 630145b9bfaa19190ab491f52658a7db550f2247
-F src/vdbeapi.c 9c2d681b75e4b90c28b9dd01a3f2e5905267f884
+F src/vdbeapi.c 21b69e71ab39d8e694c9cdb556a74dbefba9ebda
 F src/vdbeaux.c 5f1e5e98a13235cbc446501fe040eb31423fface
 F src/vdbeblob.c 82f51cdf9b0c0af729732fde48c824e498c0a1ca
 F src/vdbefifo.c 334c838c8f42d61a94813d136019ee566b5dc2f6
@@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 3e51696cb878063e4ebfdcc2a61ba94c9bebdfe3
-R 2c5db09a596b5887fe31e5ce130e47d6
+P 329dd014b0d851f21ff6690b6149e9d73c92302d
+R bf9fb86ed107ca6e77e9b8d6a0ec33f6
 U drh
-Z b6e5c906f816cb3396ed4137d0100665
+Z 091afaa93f86f18bd96775701cef18ed

diff --git a/manifest.uuid b/manifest.uuid
index c95af8a5ea50eb6101295c2898c7d7dbeab245c1..8830869a9ecf11836d948ccd8a0328c0aabd60ad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-329dd014b0d851f21ff6690b6149e9d73c92302d
\ No newline at end of file
+e8d591e8c369794921a4acbba5b17fddca730ee7
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 9445c7681586cba8c745d8b445a7bc881f54a921..f723b7d72c2b128b1fcce80096458595a9cc2ffb 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -255,13 +255,14 @@ static int sqlite3Step(Vdbe *p){
   sqlite3 *db;
   int rc;
 
+  if( p==0 || p->magic!=VDBE_MAGIC_RUN ){
+    return SQLITE_MISUSE;
+  }
+
   /* Assert that malloc() has not failed */
   db = p->db;
   assert( !db->mallocFailed );
 
-  if( p==0 || p->magic!=VDBE_MAGIC_RUN ){
-    return SQLITE_MISUSE;
-  }
   if( p->aborted ){
     return SQLITE_ABORT;
   }