From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 7 Oct 2014 19:28:33 +0000 (+0100)
Subject: NEW etc.: Provide size-safe wrappers for safe_malloc et al.
X-Git-Tag: base.ipv6-polypath-fixes.v1~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=8f828e0ffdab1adb6f28fd705c5830ef8f7ac2b4;hp=c72d679d2344a22f55889da6932754986fc0a7b9

NEW etc.: Provide size-safe wrappers for safe_malloc et al.

These automatically compute the size from the type to be assigned to,
and automatically generate a context string.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/secnet.h b/secnet.h
index 96717ae..8e5dad0 100644
--- a/secnet.h
+++ b/secnet.h
@@ -180,6 +180,16 @@ 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);
 
+#define NEW(p)					\
+    ((p)=safe_malloc(sizeof(*(p)),		\
+		     __FILE__ ":" #p))
+#define NEW_ARY(p,count)					\
+    ((p)=safe_malloc_ary(sizeof(*(p)),(count),			\
+			 __FILE__ ":" #p "[" #count "]"))
+#define REALLOC_ARY(p,count)					\
+    ((p)=safe_realloc_ary((p),sizeof(*(p)),(count),		\
+			  __FILE__ ":" #p "[" #count "]"))
+
 void setcloexec(int fd); /* cannot fail */
 void setnonblock(int fd); /* cannot fail */
 void pipe_cloexec(int fd[2]); /* pipe(), setcloexec() twice; cannot fail */