mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Marshall NULL strings correctly

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-09-07 22:15:22 -04:00
parent 9ccf08d9b8
commit 877d71a6e2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connection.c
+4 -1
View File
@@ -400,7 +400,10 @@ wl_connection_vmarshal(struct wl_connection *connection,
length = s ? strlen(s) + 1: 0; length = s ? strlen(s) + 1: 0;
*p++ = length; *p++ = length;
*sp = (const char *) p; if (length > 0)
*sp = (const char *) p;
else
*sp = NULL;
memcpy(p, s, length); memcpy(p, s, length);
p += DIV_ROUNDUP(length, sizeof *p); p += DIV_ROUNDUP(length, sizeof *p);