From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 12 Aug 2015 10:34:38 +0000 (+0000)
Subject: malloc_or_die(): Catch and prevent attempted zero-size allocations
X-Git-Tag: v_3_0_24~91
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@/@default-cgi@send-stylesheet?a=commitdiff_plain;h=d742e3533103cbd573cce873fc3b2bf112cece85;p=privoxy.git

malloc_or_die(): Catch and prevent attempted zero-size allocations
---

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)