X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fmalloc.h;h=40b6272d5aacbc9d26c06ff9006ae98186603eb1;hb=5b7e4f49787da905b9ec7d01eaf76462ca3a6e28;hp=d0e620a3fd2e4102ec98aeac8c6c3efa5582ffcb;hpb=deb6bcac8d1e1ecec4aafaee2d27dbe467e4f461;p=catta

diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h
index d0e620a..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);
@@ -60,15 +74,12 @@ char *avahi_strndup(const char *s, size_t l);
 void *avahi_memdup(const void *s, size_t l);
 
 /** Wraps allocator functions */
-typedef struct AvahiAllocator AvahiAllocator;
-
-/** Wraps allocator functions */
-struct AvahiAllocator {
+typedef struct AvahiAllocator {
     void* (*malloc)(size_t size);     
     void (*free)(void *p);           
     void* (*realloc)(void *p, size_t size);
     void* (*calloc)(size_t nmemb, size_t size);   /**< May be NULL */
-};
+} AvahiAllocator;
 
 /** Change the allocator. May be NULL to return to default (libc)
  * allocators. The structure is not copied! */