X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fmalloc.h;h=40b6272d5aacbc9d26c06ff9006ae98186603eb1;hb=564b9dd0f1da53ee73e667618d5bb1d65b0c309f;hp=d911a3a35d64306cd39edeb97cc2fa2c7b988d7b;hpb=6efe2615e04c6ef664fa9d49b013e261ba1e6e66;p=catta

diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h
index d911a3a..40b6272 100644
--- a/avahi-common/malloc.h
+++ b/avahi-common/malloc.h
@@ -26,6 +26,8 @@
 
 #include <sys/types.h>
 #include <stdarg.h>
+#include <limits.h>
+#include <assert.h>
 
 #include <avahi-common/cdecl.h>
 #include <avahi-common/gccmacro.h>
@@ -44,11 +46,23 @@ void avahi_free(void *p);
 /** Similar to libc's realloc() */
 void *avahi_realloc(void *p, size_t size);
 
+/** Internal helper for avahi_new() */
+static inline void* avahi_new_internal(unsigned n, size_t k) {
+    assert(n < INT_MAX/k);
+    return avahi_malloc(n*k);
+}
+
 /** Allocate n new structures of the specified type. */
-#define avahi_new(type, n) ((type*) avahi_malloc((n)*sizeof(type)))
+#define avahi_new(type, n) ((type*) avahi_new_internal((n), sizeof(type)))
+
+/** Internal helper for avahi_new0() */
+static inline void* avahi_new0_internal(unsigned n, size_t k) {
+    assert(n < INT_MAX/k);
+    return avahi_malloc0(n*k);
+}
 
 /** Same as avahi_new() but set the memory to zero */
-#define avahi_new0(type, n) ((type*) avahi_malloc0((n)*sizeof(type)))
+#define avahi_new0(type, n) ((type*) avahi_new0_internal((n), sizeof(type)))
 
 /** Just like libc's strdup() */
 char *avahi_strdup(const char *s);