X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fstrlst.c;h=46ed852720766b5df780c2d75f6f0fa5b7129caf;hb=d859c4c4c0b5889af50355f6552fbcd2eae36bd3;hp=d8206e1c8c391073b179360789318291c34aec07;hpb=ec9c575fb8d6d9ee2f929ad6cd70177e35ba9cd3;p=catta

diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c
index d8206e1..46ed852 100644
--- a/avahi-common/strlst.c
+++ b/avahi-common/strlst.c
@@ -28,14 +28,25 @@
 
 #include "strlst.h"
 
+AvahiStringList*avahi_string_list_add_anonymous(AvahiStringList *l, guint size) {
+    AvahiStringList *n;
+
+    n = g_malloc(sizeof(AvahiStringList) + size);
+    n->next = l;
+    n->size = size;
+    
+    return n;
+}
+
 AvahiStringList *avahi_string_list_add_arbitrary(AvahiStringList *l, const guint8*text, guint size) {
     AvahiStringList *n;
 
     g_assert(text);
 
-    n = g_malloc(sizeof(AvahiStringList) + size);
-    n->next = l;
-    memcpy(n->text, text, n->size = size);
+    n = avahi_string_list_add_anonymous(l, size);
+
+    if (size > 0)
+        memcpy(n->text, text, size);
     
     return n;
 }
@@ -246,12 +257,12 @@ AvahiStringList *avahi_string_list_copy(const AvahiStringList *l) {
 
 AvahiStringList *avahi_string_list_new_from_array(const gchar *array[], gint length) {
     AvahiStringList *r = NULL;
-    gint index;
+    gint i;
 
     g_assert(array);
 
-    for (index = 0; length >= 0 ? index < length : !!array[index]; index++)
-        r = avahi_string_list_add(r, array[index]);
+    for (i = 0; length >= 0 ? i < length : !!array[i]; i++)
+        r = avahi_string_list_add(r, array[i]);
 
     return r;
 }