aboutsummaryrefslogtreecommitdiff
path: root/src/malloc.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2010-07-23 17:32:23 +0000
committerdrh <drh@noemail.net>2010-07-23 17:32:23 +0000
commit7c2ed2ac25acaa71a057b98c0d183e7857628a2a (patch)
tree2b4eb6aafbdeda7d074bf3c9c220d371254387f2 /src/malloc.c
parentb2468954c2c360412117a4824aa4d1fcfc252f59 (diff)
downloadsqlite-7c2ed2ac25acaa71a057b98c0d183e7857628a2a.tar.gz
sqlite-7c2ed2ac25acaa71a057b98c0d183e7857628a2a.zip
Strenghten an assert() in malloc.c that helps to ensure that allocated memory
is freed by the appropriate routine. FossilOrigin-Name: 80db61acca034a8edff0fd23a65a0bbc9206a7b3
Diffstat (limited to 'src/malloc.c')
-rw-r--r--src/malloc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/malloc.c b/src/malloc.c
index c7f8a191c..e34c27975 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -461,7 +461,8 @@ void sqlite3DbFree(sqlite3 *db, void *p){
db->lookaside.pFree = pBuf;
db->lookaside.nOut--;
}else{
- assert( sqlite3MemdebugHasType(p, MEMTYPE_DB|MEMTYPE_HEAP) );
+ assert( sqlite3MemdebugHasType(p,
+ db ? (MEMTYPE_DB|MEMTYPE_HEAP) : MEMTYPE_HEAP) );
sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
sqlite3_free(p);
}