From d742e3533103cbd573cce873fc3b2bf112cece85 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 12 Aug 2015 10:34:38 +0000 Subject: [PATCH] malloc_or_die(): Catch and prevent attempted zero-size allocations --- miscutil.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/miscutil.c b/miscutil.c index f04344c2..b468fc68 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.77 2012/07/23 12:41:59 fabiankeil Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.78 2012/11/24 13:58:17 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -151,6 +151,14 @@ void *malloc_or_die(size_t buffer_size) { char *new_buf; + if (buffer_size == 0) + { + log_error(LOG_LEVEL_ERROR, + "malloc_or_die() called with buffer size 0"); + assert(buffer_size != 0); + buffer_size = 4096; + } + new_buf = malloc(buffer_size); if (new_buf == NULL) -- 2.39.2