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

Marshall NULL strings without crashing

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-08-27 22:16:50 -04:00
parent 4eb536091a
commit 3bbbd15c65
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connection.c
+12 -8
View File
@@ -338,7 +338,7 @@ wl_connection_vmarshal(struct wl_connection *connection,
break; break;
case 's': case 's':
s = va_arg(ap, const char *); s = va_arg(ap, const char *);
length = strlen(s); length = s ? strlen(s) : 0;
*p++ = length; *p++ = length;
memcpy(p, s, length); memcpy(p, s, length);
p += DIV_ROUNDUP(length, sizeof(*p)); p += DIV_ROUNDUP(length, sizeof(*p));
@@ -456,14 +456,18 @@ wl_connection_demarshal(struct wl_connection *connection,
goto out; goto out;
} }
values[i].string = malloc(length + 1); if (length == 0) {
if (values[i].string == NULL) { values[i].string = NULL;
errno = ENOMEM; } else {
ret = -1; values[i].string = malloc(length + 1);
goto out; if (values[i].string == NULL) {
errno = ENOMEM;
ret = -1;
goto out;
}
memcpy(values[i].string, p, length);
values[i].string[length] = '\0';
} }
memcpy(values[i].string, p, length);
values[i].string[length] = '\0';
p = next; p = next;
break; break;
case 'o': case 'o':