diff options
| author | drh <drh@noemail.net> | 2014-10-31 14:53:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-10-31 14:53:32 +0000 |
| commit | ca3e10ea37c4808fa84063f06b02229801b28cc0 (patch) | |
| tree | 25f7d9b2ab4ff71311882bcee951b6e9ab1cb62f /src/prepare.c | |
| parent | bc2866ca7abc2ad7cbb6878d65cd18e584cff8f5 (diff) | |
| parent | 0fb5daed34ba6f16d761b8ad02b944ec59cf5c03 (diff) | |
| download | sqlite-ca3e10ea37c4808fa84063f06b02229801b28cc0.tar.gz sqlite-ca3e10ea37c4808fa84063f06b02229801b28cc0.zip | |
Merge recent trunk enhancements, and in particular the improvements to
the b-tree balancing logic, into the sessions branch.
FossilOrigin-Name: 28b044a51215a3f64dafb2cf3b6cb7d2029580ef
Diffstat (limited to 'src/prepare.c')
| -rw-r--r-- | src/prepare.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/prepare.c b/src/prepare.c index a05e619f3..ca9c64b44 100644 --- a/src/prepare.c +++ b/src/prepare.c @@ -709,9 +709,12 @@ static int sqlite3LockAndPrepare( const char **pzTail /* OUT: End of parsed string */ ){ int rc; - assert( ppStmt!=0 ); + +#ifdef SQLITE_ENABLE_API_ARMOR + if( ppStmt==0 ) return SQLITE_MISUSE_BKPT; +#endif *ppStmt = 0; - if( !sqlite3SafetyCheckOk(db) ){ + if( !sqlite3SafetyCheckOk(db)||zSql==0 ){ return SQLITE_MISUSE_BKPT; } sqlite3_mutex_enter(db->mutex); @@ -818,9 +821,11 @@ static int sqlite3Prepare16( const char *zTail8 = 0; int rc = SQLITE_OK; - assert( ppStmt ); +#ifdef SQLITE_ENABLE_API_ARMOR + if( ppStmt==0 ) return SQLITE_MISUSE_BKPT; +#endif *ppStmt = 0; - if( !sqlite3SafetyCheckOk(db) ){ + if( !sqlite3SafetyCheckOk(db)||zSql==0 ){ return SQLITE_MISUSE_BKPT; } if( nBytes>=0 ){ |