proplist: allow setting of zero-length data properties

This commit is contained in:
Lennart Poettering 2009-08-27 05:33:45 +02:00 committed by Colin Guthrie
parent 35ccb319e6
commit b10bddf99b

View file

@ -236,7 +236,7 @@ int pa_proplist_set(pa_proplist *p, const char *key, const void *data, size_t nb
pa_assert(p); pa_assert(p);
pa_assert(key); pa_assert(key);
pa_assert(data); pa_assert(data || nbytes == 0);
if (!property_name_valid(key)) if (!property_name_valid(key))
return -1; return -1;
@ -249,7 +249,8 @@ int pa_proplist_set(pa_proplist *p, const char *key, const void *data, size_t nb
pa_xfree(prop->value); pa_xfree(prop->value);
prop->value = pa_xmalloc(nbytes+1); prop->value = pa_xmalloc(nbytes+1);
memcpy(prop->value, data, nbytes); if (nbytes > 0)
memcpy(prop->value, data, nbytes);
((char*) prop->value)[nbytes] = 0; ((char*) prop->value)[nbytes] = 0;
prop->nbytes = nbytes; prop->nbytes = nbytes;