GuardedAlloc: safer MEM_SAFE_FREE

only instantiate the argument once,
so MEM_SAFE_FREE(array[i++]), won't cause incorrect behavior.
This commit is contained in:
Campbell Barton 2015-02-28 14:41:15 +11:00
parent 57646cb2ce
commit 17d96ca2aa
1 changed files with 17 additions and 1 deletions

View File

@ -177,7 +177,23 @@ extern "C" {
/** Get the peak memory usage in bytes, including mmap allocations. */
extern size_t (*MEM_get_peak_memory)(void) ATTR_WARN_UNUSED_RESULT;
#define MEM_SAFE_FREE(v) if (v) { MEM_freeN(v); v = NULL; } (void)0
#ifdef __GNUC__
#define MEM_SAFE_FREE(v) do { \
typeof(&(v)) _v = &(v); \
if (*_v) { \
MEM_freeN(*_v); \
*_v = NULL; \
} \
} while (0)
#else
#define MEM_SAFE_FREE(v) do { \
void ** _v = (void **)&(v); \
if (*_v) { \
MEM_freeN(*_v); \
*_v = NULL; \
} \
} while (0)
#endif
/* overhead for lockfree allocator (use to avoid slop-space) */
#define MEM_SIZE_OVERHEAD sizeof(size_t)