From 4e6100494c4fdea43cb95df1abb68958a89d7935 Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Sun, 9 Aug 2020 08:55:20 +0100 Subject: Handle allocation failures explicitly in *_init() functions --- reaper.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'reaper.c') diff --git a/reaper.c b/reaper.c index e74dd6cd..adc89e3c 100644 --- a/reaper.c +++ b/reaper.c @@ -10,7 +10,6 @@ #define LOG_ENABLE_DBG 0 #include "log.h" #include "tllist.h" -#include "xmalloc.h" struct reaper { struct fdm *fdm; @@ -40,7 +39,14 @@ reaper_init(struct fdm *fdm) return NULL; } - struct reaper *reaper = xmalloc(sizeof(*reaper)); + struct reaper *reaper = malloc(sizeof(*reaper)); + if (unlikely(reaper == NULL)) { + LOG_ERRNO("malloc() failed"); + close(fd); + sigprocmask(SIG_UNBLOCK, &mask, NULL); + return NULL; + } + *reaper = (struct reaper){ .fdm = fdm, .fd = fd, -- cgit v1.3