Commit 8d196eba authored by antirez's avatar antirez
Browse files

zmalloc fix, return NULL or real malloc failure

parent 71aee3e9
...@@ -36,6 +36,7 @@ static size_t used_memory = 0; ...@@ -36,6 +36,7 @@ static size_t used_memory = 0;
void *zmalloc(size_t size) { void *zmalloc(size_t size) {
void *ptr = malloc(size+sizeof(size_t)); void *ptr = malloc(size+sizeof(size_t));
if (!ptr) return NULL;
*((size_t*)ptr) = size; *((size_t*)ptr) = size;
used_memory += size+sizeof(size_t); used_memory += size+sizeof(size_t);
return (char*)ptr+sizeof(size_t); return (char*)ptr+sizeof(size_t);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment