From 6f146b5d44db84d647d18805ca58586e1555a0a4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 20 Sep 2014 14:10:28 +0100 Subject: [PATCH] realloc: Provide safe_realloc_ary Also, make it OK to call safe_malloc(0). Signed-off-by: Ian Jackson --- secnet.h | 2 ++ util.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/secnet.h b/secnet.h index 0e2e1f7..e79352b 100644 --- a/secnet.h +++ b/secnet.h @@ -165,6 +165,8 @@ extern uint32_t string_list_to_word(list_t *l, struct flagstr *f, extern char *safe_strdup(const char *string, const char *message); extern void *safe_malloc(size_t size, const char *message); extern void *safe_malloc_ary(size_t size, size_t count, const char *message); +extern void *safe_realloc_ary(void *p, size_t size, size_t count, + const char *message); void setcloexec(int fd); /* cannot fail */ void pipe_cloexec(int fd[2]); /* pipe(), setcloexec() twice; cannot fail */ diff --git a/util.c b/util.c index 9c8abb3..e34336c 100644 --- a/util.c +++ b/util.c @@ -71,17 +71,30 @@ char *safe_strdup(const char *s, const char *message) void *safe_malloc(size_t size, const char *message) { void *r; + if (!size) + return 0; r=malloc(size); if (!r) { fatal_perror("%s",message); } return r; } -void *safe_malloc_ary(size_t size, size_t count, const char *message) { +void *safe_realloc_ary(void *p, size_t size, size_t count, + const char *message) { if (count >= INT_MAX/size) { fatal("array allocation overflow: %s", message); } - return safe_malloc(size*count, message); + assert(size && count); + p = realloc(p, size*count); + if (!p) + fatal_perror("%s", message); + return p; +} + +void *safe_malloc_ary(size_t size, size_t count, const char *message) { + if (!size || !count) + return 0; + return safe_realloc_ary(0,size,count,message); } /* Convert a buffer into its MP_INT representation */ -- 2.30.2