Merge branch 'master' into record_mixing

1 files changed, 6 insertions, 0 deletions

diff --git a/include/malloc.h b/include/malloc.h
index f3a731797..003ee1f03 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -5,6 +5,12 @@
 #define calloc(ct, sz) AllocZeroed((ct) * (sz))
 #define free Free
 
+#define FREE_AND_SET_NULL(ptr)          \
+{                                       \
+    free(ptr);                          \
+    ptr = NULL;                         \
+}
+
 extern u8 gHeap[];
 void *Alloc(u32 size);
 void *AllocZeroed(u32 size);