---

pcwalton · pcwalton · commit b407e925e64f · 2011-06-16T11:16:03.000-07:00
yaml --- r: 3148 b: refs/heads/master c: 02c0501 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4673eb6839852b3902dc6855cce48d195c3b4092
+refs/heads/master: 02c0501a6185da2d3bfce2be1b2bc02abbd36bb9
diff --git a/trunk/src/rt/memory_region.cpp b/trunk/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) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 4673eb6839852b3902dc6855cce48d195c3b4092`
	`2`	`+refs/heads/master: 02c0501a6185da2d3bfce2be1b2bc02abbd36bb9`