Marshall NULL strings correctly

14 years ago · 877d71a6e2
parent 9ccf08d9b8
commit 877d71a6e2
1 changed files with 4 additions and 1 deletions
--- a/connection.c
+++ b/connection.c
@ -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);