diff options
| author | drh <drh@noemail.net> | 2016-02-02 02:22:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-02 02:22:30 +0000 |
| commit | 33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9 (patch) | |
| tree | e820c4a4276381c4c71f8cf891e75dc67302fa8b /src/prepare.c | |
| parent | e1ed0bb6077cc223fa54f58ae835f133d1c4aa59 (diff) | |
| parent | b8db549832d2acc2fc30327e6fb5c0474820f122 (diff) | |
| download | sqlite-33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9.tar.gz sqlite-33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9.zip | |
Merge all recent enhancements from trunk.
FossilOrigin-Name: f3f9200115caf4b356f90ec97c351d1afbcb9bf6
Diffstat (limited to 'src/prepare.c')
| -rw-r--r-- | src/prepare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/prepare.c b/src/prepare.c index acc70dd2d..f8ad54665 100644 --- a/src/prepare.c +++ b/src/prepare.c @@ -525,7 +525,7 @@ static int sqlite3Prepare( } pParse->pReprepare = pReprepare; assert( ppStmt && *ppStmt==0 ); - assert( !db->mallocFailed ); + /* assert( !db->mallocFailed ); // not true with SQLITE_USE_ALLOCA */ assert( sqlite3_mutex_held(db->mutex) ); /* Check to verify that it is possible to get a read lock on all @@ -582,8 +582,8 @@ static int sqlite3Prepare( zSqlCopy = sqlite3DbStrNDup(db, zSql, nBytes); if( zSqlCopy ){ sqlite3RunParser(pParse, zSqlCopy, &zErrMsg); - sqlite3DbFree(db, zSqlCopy); pParse->zTail = &zSql[pParse->zTail-zSqlCopy]; + sqlite3DbFree(db, zSqlCopy); }else{ pParse->zTail = &zSql[nBytes]; } |