about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2011-06-16 11:13:23 -0700
committerPatrick Walton <pcwalton@mimiga.net>2011-06-16 11:16:03 -0700
commit02c0501a6185da2d3bfce2be1b2bc02abbd36bb9 (patch)
tree4bafae64ff506da9048e51535382ccd042d601a5
parent4673eb6839852b3902dc6855cce48d195c3b4092 (diff)
downloadrust-02c0501a6185da2d3bfce2be1b2bc02abbd36bb9.tar.gz
rust-02c0501a6185da2d3bfce2be1b2bc02abbd36bb9.zip
rt: memory_region::free(NULL) shouldn't touch the live allocation count
-rw-r--r--src/rt/memory_region.cpp1
1 files changed, 1 insertions, 0 deletions
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) {