Updated to check for NULL

schuchert · Oct 8, 2011 · 636e2e9 · 636e2e9
1 parent ef0fb30
commit 636e2e9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CommonMemory.h b/CommonMemory.h
@@ -5,10 +5,12 @@
 #ifdef CPPUTEST_USE_MEM_LEAK_DETECTION
 #include <CppUTest/TestHarness_c.h>
 #define acquire(s) cpputest_malloc_location((s), __FILE__, __LINE__)
-#define release(s) cpputest_free_location((s), __FILE__, __LINE__)
+#define release(s) if(s != NULL) cpputest_free_location((s), __FILE__, __LINE__)
 #else
+#include <memory.h>
+#include <stddef.h>
 #define acquire(s) malloc((s))
-#define release(s) free((s))
+#define release(s) if(s != NULL) free(s)
 #endif
 
 #include <stdlib.h>