X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fmalloc.c;h=9b0e22e12b70ae7aa88065a75c2a2ef59232efae;hb=9642bac4b85de24ce62c53ad6a8e2ab4b2dd31ba;hp=018a0c0d95e403f7e879f450985cd06621f979b6;hpb=4f0a5e7572a4257894b4bfede42c26d65152609e;p=catta

diff --git a/avahi-common/malloc.c b/avahi-common/malloc.c
index 018a0c0..9b0e22e 100644
--- a/avahi-common/malloc.c
+++ b/avahi-common/malloc.c
@@ -169,16 +169,16 @@ char *avahi_strdup(const char *s) {
 char *avahi_strndup(const char *s, size_t max) {
     char *r;
     size_t size;
+    const char *p;
     
     if (!s)
         return NULL;
 
-    size = strlen(s);
-
-    if (size > max)
-        size = max;
+    for (p = s, size = 0;
+         size < max && *p;
+         p++, size++);
     
-    if (!(r = avahi_malloc(size+1)))
+    if (!(r = avahi_new(char, size+1)))
         return NULL;
 
     memcpy(r, s, size);