From f1fce96a1d8026474b2cd56a855fd001cfd108b6 Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Tue, 4 Aug 2020 23:28:16 +0100 Subject: config: handle allocation failure explicitly --- xmalloc.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 xmalloc.c (limited to 'xmalloc.c') diff --git a/xmalloc.c b/xmalloc.c new file mode 100644 index 00000000..aecb5787 --- /dev/null +++ b/xmalloc.c @@ -0,0 +1,78 @@ +#include +#include +#include +#include +#include "xmalloc.h" + +static NORETURN COLD void +fatal_error(const char *msg, int err) +{ + errno = err; + perror(msg); + abort(); +} + +static void * +check_alloc(void *alloc) +{ + if (unlikely(alloc == NULL)) { + fatal_error(__func__, ENOMEM); + } + return alloc; +} + +void * +xmalloc(size_t size) +{ + if (unlikely(size == 0)) { + size = 1; + } + return check_alloc(malloc(size)); +} + +void * +xcalloc(size_t nmemb, size_t size) +{ + if (unlikely(nmemb == 0 || size == 0)) { + size = 1; + } + return check_alloc(calloc(nmemb, size)); +} + +char * +xstrdup(const char *str) +{ + return check_alloc(strdup(str)); +} + +static VPRINTF(2) int +xvasprintf_(char **strp, const char *format, va_list ap) +{ + va_list ap2; + va_copy(ap2, ap); + int n = vsnprintf(NULL, 0, format, ap2); + if (unlikely(n < 0)) { + fatal_error("vsnprintf", EILSEQ); + } + va_end(ap2); + *strp = xmalloc(n + 1); + return vsnprintf(*strp, n + 1, format, ap); +} + +static VPRINTF(1) char * +xvasprintf(const char *format, va_list ap) +{ + char *str; + xvasprintf_(&str, format, ap); + return str; +} + +char * +xasprintf(const char *format, ...) +{ + va_list ap; + va_start(ap, format); + char *str = xvasprintf(format, ap); + va_end(ap); + return str; +} -- cgit v1.3 From 014019e98da7fa0f7476bea5b6f3c84dafe7558a Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Wed, 5 Aug 2020 20:11:51 +0100 Subject: xmalloc: log error to syslog() in fatal_error() function --- xmalloc.c | 3 +++ xmalloc.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'xmalloc.c') diff --git a/xmalloc.c b/xmalloc.c index aecb5787..7322953a 100644 --- a/xmalloc.c +++ b/xmalloc.c @@ -2,11 +2,14 @@ #include #include #include +#include +#include #include "xmalloc.h" static NORETURN COLD void fatal_error(const char *msg, int err) { + syslog(LOG_ERR, "%s: %s", msg, strerror(err)); errno = err; perror(msg); abort(); diff --git a/xmalloc.h b/xmalloc.h index d4e48f79..90d63031 100644 --- a/xmalloc.h +++ b/xmalloc.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include "macros.h" void *xmalloc(size_t size) XMALLOC; -- cgit v1.3