diff options
| author | mistachkin <mistachkin@noemail.net> | 2013-09-24 19:07:48 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2013-09-24 19:07:48 +0000 |
| commit | bbff2180161a86873249d332dc72a8aaf4e22f89 (patch) | |
| tree | 09b35ca0c564eacc3448303adcc127f24fb1ba2e /src/malloc.c | |
| parent | 9a5cbbc4a53b4ab409a56352cad15d0e86726a3d (diff) | |
| parent | 6284d0216044049566cd7911dd6e1f070b2ba257 (diff) | |
| download | sqlite-bbff2180161a86873249d332dc72a8aaf4e22f89.tar.gz sqlite-bbff2180161a86873249d332dc72a8aaf4e22f89.zip | |
Merge updates from trunk.
FossilOrigin-Name: 435ce3b3fc0cffb4d7e6f2694c3100066e19f9ed
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/malloc.c b/src/malloc.c index 35a44e5f6..799f0485d 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -484,6 +484,7 @@ void sqlite3_free(void *p){ */ void sqlite3DbFree(sqlite3 *db, void *p){ assert( db==0 || sqlite3_mutex_held(db->mutex) ); + if( p==0 ) return; if( db ){ if( db->pnBytesFreed ){ *db->pnBytesFreed += sqlite3DbMallocSize(db, p); |