X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/ee697dd98d0f9aca6b9df7ffb32d3a15b4e33d6d..6f146b5d44db84d647d18805ca58586e1555a0a4:/util.c

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 */