diff options
| -rw-r--r-- | avahi-common/strlst.c | 2 | ||||
| -rw-r--r-- | avahi-daemon/dbus-util.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c index c6ceb0f..9ffa18e 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; diff --git a/avahi-daemon/dbus-util.c b/avahi-daemon/dbus-util.c index d1a7a20..ca08d7b 100644 --- a/avahi-daemon/dbus-util.c +++ b/avahi-daemon/dbus-util.c @@ -344,6 +344,9 @@ int avahi_dbus_read_strlst(DBusMessage *m, int idx, AvahiStringList **l) { k = (const uint8_t*) ""; n = 0; dbus_message_iter_get_fixed_array(&sub2, &k, &n); + + if (!k) + k = (const uint8_t*) ""; strlst = avahi_string_list_add_arbitrary(strlst, k, n); |