Add an assert() that verifies that the statement pointer from

the sqlite3_prepare() family of functions is always NULL if the routines
return other than SQLITE_OK.

FossilOrigin-Name: 0bb1cfc63f982db7b29c8e6be6698a6dad100f70

diff --git a/manifest b/manifest
index 1f29b07d69882d1c3d15ed4ae74fb7b049ed0b83..813436b83df84c8c7ba97c5de3ea5510193340b5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.7.12
-D 2012-05-14T01:41:23.304
+C Add\san\sassert()\sthat\sverifies\sthat\sthe\sstatement\spointer\sfrom\s\nthe\ssqlite3_prepare()\sfamily\sof\sfunctions\sis\salways\sNULL\sif\sthe\sroutines\nreturn\sother\sthan\sSQLITE_OK.
+D 2012-05-14T12:20:54.347
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
 F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
 F src/pragma.c e708b3bb5704605816f617e0b1d63a5488060715
-F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
+F src/prepare.c 9a00a9612ebf80203fbb41f8a29ab8cb27a05f40
 F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
@@ -997,10 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P af525b5d25b5dee20528acc8321b8c6ca9aa98ae
-R 25bb989b178d8b31e0e59b449786abed
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.7.12 *
+P 8654aa9540fe9fd210899d83d17f3f407096c004
+R 0a00ace346f978ead4e8eda443adff7b
 U drh
-Z 093fff96464341c2fff7d3363f677b3a
+Z 6b79d382c12877c842863c97c5282a5e

diff --git a/manifest.uuid b/manifest.uuid
index f4728f553f802627655a56963c9758b86d0e455b..a3cbab7aee4e936494f3af2b95448fe82f967c0b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8654aa9540fe9fd210899d83d17f3f407096c004
\ No newline at end of file
+0bb1cfc63f982db7b29c8e6be6698a6dad100f70
\ No newline at end of file

diff --git a/src/prepare.c b/src/prepare.c
index faeefa894f8bcce72b601724131466ec2d0a00e4..c46e55ed2c8d794be6cb7fb93d456b6685f42236 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -706,6 +706,7 @@ static int sqlite3LockAndPrepare(
   }
   sqlite3BtreeLeaveAll(db);
   sqlite3_mutex_leave(db->mutex);
+  assert( rc==SQLITE_OK || *ppStmt==0 );
   return rc;
 }