* strip glib from avahi-core

* implement glib memory allocator
* add new documentation file MALLOC
* initialize pseudo-RNG from /dev/urandom in avahi-daemon
* remove some gcc 4.0 warnings 
* beef up watch system with real timeouts
* move GCC __attribute__ macros into its own header avahi-common/gccmacro.h
* make use of GCC's sentinel attribute where it make sense
* add malloc() implementations that abort on OOM and enable them by default


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@308 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 68 insertions, 3 deletions

diff --git a/avahi-common/malloc.c b/avahi-common/malloc.c
index 1883849..018a0c0 100644
--- a/avahi-common/malloc.c
+++ b/avahi-common/malloc.c
@@ -27,18 +27,78 @@
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "malloc.h"
 
 static const AvahiAllocator *allocator = NULL;
 
+static void oom(void) AVAHI_GCC_NORETURN;
+
+static void oom(void) {
+    
+    static const char msg[] = "Out of memory, aborting ...\n";
+    const char *n = msg;
+
+    while (strlen(n) > 0) {
+        ssize_t r;
+        
+        if ((r = write(2, n, strlen(n))) < 0)
+            break;
+
+        n += r;
+    }
+
+    abort();
+}
+
+/* Default implementation for avahi_malloc() */
+static void* xmalloc(size_t size) {
+    void *p;
+
+    if (size == 0)
+        return NULL;
+
+    if (!(p = malloc(size)))
+        oom();
+
+    return p;
+}
+
+/* Default implementation for avahi_realloc() */
+static void *xrealloc(void *p, size_t size) {
+
+    if (size == 0) {
+        free(p);
+        return NULL;
+    }
+
+    if (!(p = realloc(p, size)))
+        oom();
+
+    return p;
+}
+
+/* Default implementation for avahi_calloc() */
+static void *xcalloc(size_t nmemb, size_t size) {
+    void *p;
+    
+    if (size == 0 || nmemb == 0)
+        return NULL;
+
+    if (!(p = calloc(nmemb, size)))
+        oom();
+
+    return p;
+}
+
 void *avahi_malloc(size_t size) {
 
     if (size <= 0)
         return NULL;
     
     if (!allocator)
-        return malloc(size);
+        return xmalloc(size);
 
     assert(allocator->malloc);
     return allocator->malloc(size);
@@ -51,7 +111,7 @@ void *avahi_malloc0(size_t size) {
         return NULL;
 
     if (!allocator)
-        return calloc(1, size);
+        return xcalloc(1, size);
 
     if (allocator->calloc)
         return allocator->calloc(1, size);
@@ -79,8 +139,13 @@ void avahi_free(void *p) {
 
 void *avahi_realloc(void *p, size_t size) {
 
+    if (size == 0) {
+        avahi_free(p);
+        return NULL;
+    }
+
     if (!allocator)
-        return realloc(p, size);
+        return xrealloc(p, size);
 
     assert(allocator->realloc);
     return allocator->realloc(p, size);