X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fstrlst.c;h=b861cf82eaad58bb823c5fdbea0f1db44ed70cba;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=01118703448dc80f873abd9ab356a644899d9054;hpb=e2f7e83d25a5f0966938163c18b1fd8c399393b1;p=catta

diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c
index 0111870..b861cf8 100644
--- a/avahi-common/strlst.c
+++ b/avahi-common/strlst.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -38,7 +36,7 @@ AvahiStringList*avahi_string_list_add_anonymous(AvahiStringList *l, size_t size)
 
     if (!(n = avahi_malloc(sizeof(AvahiStringList) + size)))
         return NULL;
-    
+
     n->next = l;
     n->size = size;
 
@@ -51,7 +49,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;
@@ -70,17 +68,15 @@ AvahiStringList *avahi_string_list_add(AvahiStringList *l, const char *text) {
 
 int avahi_string_list_parse(const void* data, size_t size, AvahiStringList **ret) {
     const uint8_t *c;
-    AvahiStringList *r;
-    
+    AvahiStringList *r = NULL;
+
     assert(data);
     assert(ret);
 
-    r = NULL;
-
     c = data;
     while (size > 0) {
         size_t k;
-        
+
         k = *(c++);
         size--;
 
@@ -90,22 +86,22 @@ int avahi_string_list_parse(const void* data, size_t size, AvahiStringList **ret
         if (k > 0) { /* Ignore empty strings */
             AvahiStringList *n;
 
-            if (!(n = avahi_string_list_add_arbitrary(r, c, k)))  
+            if (!(n = avahi_string_list_add_arbitrary(r, c, k)))
                 goto fail; /* OOM */
 
             r = n;
         }
-            
+
         c += k;
         size -= k;
     }
 
     *ret = r;
-    
+
     return 0;
 
 fail:
-    avahi_string_list_free(*ret);
+    avahi_string_list_free(r);
     return -1;
 }
 
@@ -148,7 +144,7 @@ char* avahi_string_list_to_string(AvahiStringList *l) {
         return NULL;
 
     l = avahi_string_list_reverse(l);
-    
+
     for (n = l; n; n = n->next) {
         if (n != l)
             *(e++) = ' ';
@@ -163,7 +159,7 @@ char* avahi_string_list_to_string(AvahiStringList *l) {
     }
 
     l = avahi_string_list_reverse(l);
-    
+
     *e = 0;
 
     return t;
@@ -173,65 +169,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;
-        
-            l = avahi_string_list_reverse(l);
-            c = data;
-            
-            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);
-            
-        } else {
+        AvahiStringList *n;
+        uint8_t *c;
+
+        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;
+
+            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;
+
+            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;
@@ -263,7 +258,7 @@ AvahiStringList *avahi_string_list_add_many(AvahiStringList *r, ...) {
     va_start(va, r);
     r = avahi_string_list_add_many_va(r, va);
     va_end(va);
-    
+
     return r;
 }
 
@@ -331,7 +326,7 @@ unsigned avahi_string_list_length(const AvahiStringList *l) {
 AvahiStringList *avahi_string_list_add_vprintf(AvahiStringList *l, const char *format, va_list va) {
     size_t len = 80;
     AvahiStringList *r;
-    
+
     assert(format);
 
     if (!(r = avahi_malloc(sizeof(AvahiStringList) + len)))
@@ -340,8 +335,11 @@ AvahiStringList *avahi_string_list_add_vprintf(AvahiStringList *l, const char *f
     for (;;) {
         int n;
         AvahiStringList *nr;
-        
-        n = vsnprintf((char*) r->text, len+1, format, va);
+        va_list va2;
+
+        va_copy(va2, va);
+        n = vsnprintf((char*) r->text, len, format, va2);
+        va_end(va2);
 
         if (n >= 0 && n < (int) len)
             break;
@@ -359,28 +357,27 @@ AvahiStringList *avahi_string_list_add_vprintf(AvahiStringList *l, const char *f
         r = nr;
     }
 
-    
     r->next = l;
-    r->size = strlen((char*) r->text); 
+    r->size = strlen((char*) r->text);
 
     return r;
 }
 
 AvahiStringList *avahi_string_list_add_printf(AvahiStringList *l, const char *format, ...) {
     va_list va;
-    
+
     assert(format);
 
     va_start(va, format);
     l  = avahi_string_list_add_vprintf(l, format, va);
     va_end(va);
 
-    return l;    
+    return l;
 }
 
 AvahiStringList *avahi_string_list_find(AvahiStringList *l, const char *key) {
     size_t n;
-    
+
     assert(key);
     n = strlen(key);
 
@@ -412,7 +409,7 @@ AvahiStringList *avahi_string_list_add_pair_arbitrary(AvahiStringList *l, const
         return avahi_string_list_add(l, key);
 
     n = strlen(key);
-    
+
     if (!(l = avahi_string_list_add_anonymous(l, n + 1 + size)))
         return NULL;
 
@@ -425,12 +422,12 @@ AvahiStringList *avahi_string_list_add_pair_arbitrary(AvahiStringList *l, const
 
 int avahi_string_list_get_pair(AvahiStringList *l, char **key, char **value, size_t *size) {
     char *e;
-    
+
     assert(l);
 
     if (!(e = memchr(l->text, '=', l->size))) {
 
-        if (key) 
+        if (key)
             if (!(*key = avahi_strdup((char*) l->text)))
                 return -1;
 
@@ -448,9 +445,9 @@ int avahi_string_list_get_pair(AvahiStringList *l, char **key, char **value, siz
                 return -1;
 
         e++; /* Advance after '=' */
-        
+
         n = l->size - (e - (char*) l->text);
-        
+
         if (value) {
 
             if (!(*value = avahi_memdup(e, n+1))) {
@@ -488,7 +485,7 @@ uint32_t avahi_string_list_get_service_cookie(AvahiStringList *l) {
     AvahiStringList *f;
     char *value = NULL, *end = NULL;
     uint32_t ret;
-    
+
     if (!(f = avahi_string_list_find(l, AVAHI_SERVICE_COOKIE)))
         return AVAHI_SERVICE_COOKIE_INVALID;
 
@@ -503,6 +500,6 @@ uint32_t avahi_string_list_get_service_cookie(AvahiStringList *l) {
     }
 
     avahi_free(value);
-    
+
     return ret;
 }