From 02c0501a6185da2d3bfce2be1b2bc02abbd36bb9 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 16 Jun 2011 11:13:23 -0700 Subject: rt: memory_region::free(NULL) shouldn't touch the live allocation count --- src/rt/memory_region.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/rt/memory_region.cpp') diff --git a/src/rt/memory_region.cpp b/src/rt/memory_region.cpp index 48220290270..6c50bf42d8c 100644 --- a/src/rt/memory_region.cpp +++ b/src/rt/memory_region.cpp @@ -21,6 +21,7 @@ memory_region::memory_region(memory_region *parent) : void memory_region::free(void *mem) { // printf("free: ptr 0x%" PRIxPTR"\n", (uintptr_t) mem); + if (!mem) { return; } if (_synchronized) { _lock.lock(); } #ifdef TRACK_ALLOCATIONS if (_allocation_list.replace(mem, NULL) == false) { -- cgit 1.4.1-3-g733a5