From: Lennart Poettering Date: Sun, 1 Jan 2006 14:17:54 +0000 (+0000) Subject: when serializing string lists for DNS TXT records, ignore empty strings unconditionally X-Git-Url: http://git.meshlink.io/?a=commitdiff_plain;h=1b9ed98f7bdf7ff20057cca848ccfdebf6f4dfdd;p=catta when serializing string lists for DNS TXT records, ignore empty strings unconditionally git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1050 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c index 0111870..c6ceb0f 100644 --- a/avahi-common/strlst.c +++ b/avahi-common/strlst.c @@ -70,13 +70,11 @@ 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; @@ -105,7 +103,7 @@ int avahi_string_list_parse(const void* data, size_t size, AvahiStringList **ret return 0; fail: - avahi_string_list_free(*ret); + avahi_string_list_free(r); return -1; } @@ -173,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; - } else { + 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;