diff options
author | drh <drh@noemail.net> | 2016-02-06 19:48:50 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2016-02-06 19:48:50 +0000 |
commit | f5818aa560fc463e241bbeeaefba8cfacdd0131f (patch) | |
tree | d929563a72b70770021747cedc085cf56974eb88 /src/malloc.c | |
parent | bb3da060e3d90da84944b1d75df74ce7697d8998 (diff) | |
download | sqlite-f5818aa560fc463e241bbeeaefba8cfacdd0131f.tar.gz sqlite-f5818aa560fc463e241bbeeaefba8cfacdd0131f.zip |
Make sure variable declarations occur at the beginning of blocks, even
with SQLITE_DEBUG enabled.
FossilOrigin-Name: 2f7778e64d93ef237e23ceac01ea9808df5cf2a1
Diffstat (limited to 'src/malloc.c')
-rw-r--r-- | src/malloc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/malloc.c b/src/malloc.c index 1ff0a5221..ebe044035 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -626,11 +626,11 @@ void *sqlite3DbMallocRaw(sqlite3 *db, u64 n){ return p; } void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){ +#ifndef SQLITE_OMIT_LOOKASIDE + LookasideSlot *pBuf; assert( db!=0 ); assert( sqlite3_mutex_held(db->mutex) ); assert( db->pnBytesFreed==0 ); -#ifndef SQLITE_OMIT_LOOKASIDE - LookasideSlot *pBuf; if( db->lookaside.bDisable==0 ){ assert( db->mallocFailed==0 ); if( n>db->lookaside.sz ){ @@ -650,6 +650,9 @@ void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){ return 0; } #else + assert( db!=0 ); + assert( sqlite3_mutex_held(db->mutex) ); + assert( db->pnBytesFreed==0 ); if( db->mallocFailed ){ return 0; } |