Marshall NULL strings correctly

This commit is contained in:
Kristian Høgsberg 2010-09-07 22:15:22 -04:00
parent 9ccf08d9b8
commit 877d71a6e2

View File

@ -400,7 +400,10 @@ wl_connection_vmarshal(struct wl_connection *connection,
length = s ? strlen(s) + 1: 0;
*p++ = length;
*sp = (const char *) p;
if (length > 0)
*sp = (const char *) p;
else
*sp = NULL;
memcpy(p, s, length);
p += DIV_ROUNDUP(length, sizeof *p);