X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fstrlst.c;h=f8be27312bfc1756ae1de8acc2152f6d2faaaa77;hb=4e0e2fd598d2d155a55e58b024de5b58592bec0e;hp=a7df6c97a8545998d4868b16ae098e56afc5968c;hpb=9b68da84a46cfb4989bee3499278ada856d96758;p=catta

diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c
index a7df6c9..f8be273 100644
--- a/avahi-common/strlst.c
+++ b/avahi-common/strlst.c
@@ -51,7 +51,7 @@ AvahiStringList*avahi_string_list_add_anonymous(AvahiStringList *l, size_t size)
 AvahiStringList *avahi_string_list_add_arbitrary(AvahiStringList *l, const uint8_t*text, size_t size) {
     AvahiStringList *n;
 
-    assert(text);
+    assert(size == 0 || text);
 
     if (!(n = avahi_string_list_add_anonymous(l, size)))
         return NULL;
@@ -68,29 +68,43 @@ AvahiStringList *avahi_string_list_add(AvahiStringList *l, const char *text) {
     return avahi_string_list_add_arbitrary(l, (const uint8_t*) text, strlen(text));
 }
 
-AvahiStringList *avahi_string_list_parse(const void* data, size_t size) {
-    AvahiStringList *r = NULL;
+int avahi_string_list_parse(const void* data, size_t size, AvahiStringList **ret) {
     const uint8_t *c;
+    AvahiStringList *r = NULL;
     
     assert(data);
+    assert(ret);
 
     c = data;
-    for (;;) {
+    while (size > 0) {
         size_t k;
         
-        if (size < 1)
-            break;
-
         k = *(c++);
+        size--;
 
-        if (k > 0) /* Ignore empty strings */
-            r = avahi_string_list_add_arbitrary(r, c, k);
-        c += k;
+        if (k > size)
+            goto fail; /* Overflow */
+
+        if (k > 0) { /* Ignore empty strings */
+            AvahiStringList *n;
 
-        size -= 1 + k;
+            if (!(n = avahi_string_list_add_arbitrary(r, c, k)))  
+                goto fail; /* OOM */
+
+            r = n;
+        }
+            
+        c += k;
+        size -= k;
     }
 
-    return r;
+    *ret = r;
+    
+    return 0;
+
+fail:
+    avahi_string_list_free(r);
+    return -1;
 }
 
 void avahi_string_list_free(AvahiStringList *l) {
@@ -157,65 +171,64 @@ size_t avahi_string_list_serialize(AvahiStringList *l, void *data, size_t size)
     size_t used = 0;
 
     if (data) {
-    
-        if (l) {
-            uint8_t *c;
-            AvahiStringList *n;
+        AvahiStringList *n;
+        uint8_t *c;
+
+        l = avahi_string_list_reverse(l);
+        c = data;
         
-            l = avahi_string_list_reverse(l);
-            c = data;
+        for (n = l; size > 1 && n; n = n->next) {
+            size_t k;
+
+            if ((k = n->size) == 0)
+                /* Skip empty strings */
+                continue;
             
-            for (n = l; n; n = n->next) {
-                size_t k;
-                if (size < 1)
-                    break;
-                
-                k = n->size;
-                if (k > 255)
-                    k = 255;
-                
-                if (k > size-1)
-                    k = size-1;
-                
-                *(c++) = k;
-                memcpy(c, n->text, k);
-                c += k;
-                
-                used += 1+ k;
-            }
-        
-            l = avahi_string_list_reverse(l);
+            if (k > 255)
+                /* Truncate strings at 255 characters */
+                k = 255;
+            
+            if (k > size-1)
+                /* Make sure this string fits in */
+                k = size-1;
+
+            *(c++) = (uint8_t) k;
+            memcpy(c, n->text, k);
+            c += k;
             
-        } else {
+            used += 1 + k;
+            size -= 1 + k;
+        }
+        
+        l = avahi_string_list_reverse(l);
 
+        if (used == 0 && size > 0) {
+        
             /* Empty lists are treated specially. To comply with
              * section 6.1 of the DNS-SD spec, we return a single
              * empty string (i.e. a NUL byte)*/
 
-            if (size > 0) {
-                *(uint8_t*) data = 0;
-                used = 1;
-            }
-            
+            *(uint8_t*) data = 0;
+            used = 1;
         }
             
     } else {
         AvahiStringList *n;
 
-        if (!l)
-            used = 1;
-        else {
-
-            for (n = l; n; n = n->next) {
-                size_t k;
-                
-                k = n->size;
-                if (k > 255)
-                    k = 255;
-                
-                used += 1+k;
-            }
+        for (n = l; n; n = n->next) {
+            size_t k;
+            
+            if ((k = n->size) == 0)
+                continue;
+            
+            if (k > 255)
+                k = 255;
+            
+            used += 1+k;
         }
+
+        if (used == 0)
+            used = 1;
     }
 
     return used;
@@ -283,7 +296,10 @@ AvahiStringList *avahi_string_list_copy(const AvahiStringList *l) {
     AvahiStringList *r = NULL;
 
     for (; l; l = l->next)
-        r = avahi_string_list_add_arbitrary(r, l->text, l->size);
+        if (!(r = avahi_string_list_add_arbitrary(r, l->text, l->size))) {
+            avahi_string_list_free(r);
+            return NULL;
+        }
 
     return avahi_string_list_reverse(r);
 }
@@ -321,8 +337,11 @@ AvahiStringList *avahi_string_list_add_vprintf(AvahiStringList *l, const char *f
     for (;;) {
         int n;
         AvahiStringList *nr;
+        va_list va2;
         
-        n = vsnprintf((char*) r->text, len+1, format, va);
+        va_copy(va2, va);
+        n = vsnprintf((char*) r->text, len, format, va2);
+        va_end(va2);
 
         if (n >= 0 && n < (int) len)
             break;
@@ -339,7 +358,6 @@ AvahiStringList *avahi_string_list_add_vprintf(AvahiStringList *l, const char *f
 
         r = nr;
     }
-
     
     r->next = l;
     r->size = strlen((char*) r->text); 
@@ -477,10 +495,13 @@ uint32_t avahi_string_list_get_service_cookie(AvahiStringList *l) {
         return AVAHI_SERVICE_COOKIE_INVALID;
 
     ret = (uint32_t) strtoll(value, &end, 0);
-    avahi_free(value);
 
-    if (*value && end && *end != 0)
+    if (*value && end && *end != 0) {
+        avahi_free(value);
         return AVAHI_SERVICE_COOKIE_INVALID;
+    }
 
+    avahi_free(value);
+    
     return ret;
 }