X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fxalloc.h;h=948723e30f5d7733eadaa167b92afe5d798d1098;hb=529b8fab8c21e7ae5af91d742ff202eab38e51f3;hp=f6b895a5a61ae06456b4065324e55e8e13158208;hpb=61d9b04f66055e61f0afdf8955ff890f4da39288;p=meshlink diff --git a/src/xalloc.h b/src/xalloc.h index f6b895a5..948723e3 100644 --- a/src/xalloc.h +++ b/src/xalloc.h @@ -2,7 +2,7 @@ #define MESHLINK_XALLOC_H /* - xalloc.h -- malloc and related fuctions with out of memory checking + xalloc.h -- malloc and related functions with out of memory checking Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify @@ -23,45 +23,63 @@ static inline void *xmalloc(size_t n) __attribute__((__malloc__)); static inline void *xmalloc(size_t n) { void *p = malloc(n); - if(!p) + + if(!p) { abort(); + } + return p; } static inline void *xzalloc(size_t n) __attribute__((__malloc__)); static inline void *xzalloc(size_t n) { void *p = calloc(1, n); - if(!p) + + if(!p) { abort(); + } + return p; } static inline void *xrealloc(void *p, size_t n) { p = realloc(p, n); - if(!p) + + if(!p) { abort(); + } + return p; } static inline char *xstrdup(const char *s) __attribute__((__malloc__)); static inline char *xstrdup(const char *s) { char *p = strdup(s); - if(!p) + + if(!p) { abort(); + } + return p; } static inline int xvasprintf(char **strp, const char *fmt, va_list ap) { #ifdef HAVE_MINGW char buf[1024]; - int result = vsnprintf(buf, sizeof buf, fmt, ap); - if(result < 0) + int result = vsnprintf(buf, sizeof(buf), fmt, ap); + + if(result < 0) { abort(); + } + *strp = xstrdup(buf); #else int result = vasprintf(strp, fmt, ap); - if(result < 0) + + if(result < 0) { abort(); + } + #endif return result; }