From: Junio C Hamano Date: Thu, 29 Dec 2005 09:31:26 +0000 (-0800) Subject: ?alloc: do not return NULL when asked for zero bytes X-Git-Tag: v1.0.7^2~23 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e7a2eccc21c9029180585e43b3b941d0bdf8b3b;p=git.git ?alloc: do not return NULL when asked for zero bytes Signed-off-by: Junio C Hamano --- diff --git a/git-compat-util.h b/git-compat-util.h index 0c98c9937..c353b276f 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -63,6 +63,8 @@ extern char *gitstrcasestr(const char *haystack, const char *needle); static inline void *xmalloc(size_t size) { void *ret = malloc(size); + if (!ret && !size) + ret = malloc(1); if (!ret) die("Out of memory, malloc failed"); return ret; @@ -71,6 +73,8 @@ static inline void *xmalloc(size_t size) static inline void *xrealloc(void *ptr, size_t size) { void *ret = realloc(ptr, size); + if (!ret && !size) + ret = realloc(ptr, 1); if (!ret) die("Out of memory, realloc failed"); return ret; @@ -79,6 +83,8 @@ static inline void *xrealloc(void *ptr, size_t size) static inline void *xcalloc(size_t nmemb, size_t size) { void *ret = calloc(nmemb, size); + if (!ret && (!nmemb || !size)) + ret = calloc(1, 1); if (!ret) die("Out of memory, calloc failed"); return ret;