summaryrefslogtreecommitdiffstats
path: root/avahi-common/malloc.h
diff options
context:
space:
mode:
authorMarcus Meissner <meissner@grape.suse.de>2008-09-01 10:27:25 +0200
committerLennart Poettering <lennart@poettering.net>2008-12-12 20:16:27 +0100
commitf3f1b8bb63a574853e2fbcafe47b121da972ca23 (patch)
tree5d2a8a35cfcfd82a50b8bb4e0c6a14c6a7ca420e /avahi-common/malloc.h
parentabc3a9efd1124d74155c6a70798d10710b20786d (diff)
attribute alloc_size for newer gccs.
This patch marks up the allocator functions with the GCC 4.3 (and later) attribute alloc_size. This will pass the size of allocations of known size (at compile time) to the overflow checking memcpy/strcpy and related functions. Ciao, Marcus Signed-off-by: Lennart Poettering <lennart@poettering.net>
Diffstat (limited to 'avahi-common/malloc.h')
-rw-r--r--avahi-common/malloc.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h
index 2430199..511b51c 100644
--- a/avahi-common/malloc.h
+++ b/avahi-common/malloc.h
@@ -35,19 +35,19 @@
AVAHI_C_DECL_BEGIN
/** Allocate some memory, just like the libc malloc() */
-void *avahi_malloc(size_t size);
+void *avahi_malloc(size_t size) AVAHI_GCC_ALLOC_SIZE(1);
/** Similar to avahi_malloc() but set the memory to zero */
-void *avahi_malloc0(size_t size);
+void *avahi_malloc0(size_t size) AVAHI_GCC_ALLOC_SIZE(1);
/** Free some memory */
void avahi_free(void *p);
/** Similar to libc's realloc() */
-void *avahi_realloc(void *p, size_t size);
+void *avahi_realloc(void *p, size_t size) AVAHI_GCC_ALLOC_SIZE(2);
/** Internal helper for avahi_new() */
-static inline void* avahi_new_internal(unsigned n, size_t k) {
+static inline void* AVAHI_GCC_ALLOC_SIZE2(1,2) avahi_new_internal(unsigned n, size_t k) {
assert(n < INT_MAX/k);
return avahi_malloc(n*k);
}
@@ -56,7 +56,7 @@ static inline void* avahi_new_internal(unsigned n, size_t k) {
#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) {
+static inline void* AVAHI_GCC_ALLOC_SIZE2(1,2) avahi_new0_internal(unsigned n, size_t k) {
assert(n < INT_MAX/k);
return avahi_malloc0(n*k);
}
@@ -71,14 +71,14 @@ char *avahi_strdup(const char *s);
char *avahi_strndup(const char *s, size_t l);
/** Duplicate the given memory block into a new one allocated with avahi_malloc() */
-void *avahi_memdup(const void *s, size_t l);
+void *avahi_memdup(const void *s, size_t l) AVAHI_GCC_ALLOC_SIZE(2);
/** Wraps allocator functions */
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 */
+ void* (*malloc)(size_t size) AVAHI_GCC_ALLOC_SIZE(1);
+ void (*free)(void *p);
+ void* (*realloc)(void *p, size_t size) AVAHI_GCC_ALLOC_SIZE(2);
+ void* (*calloc)(size_t nmemb, size_t size) AVAHI_GCC_ALLOC_SIZE2(1,2); /**< May be NULL */
} AvahiAllocator;
/** Change the allocator. May be NULL to return to default (libc)