mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-15 06:59:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

connection: zero out string padding

Browse source 
We don't want to send random data to the client and this also keeps
valgrind happy.
This commit is contained in:
Kristian Høgsberg 2012-08-03 22:39:51 -04:00
parent 7f3d22776b
commit 915cdeee29
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/connection.c
View file

@ -436,7 +436,7 @@ wl_closure_vmarshal(struct wl_object *sender,
{ {
struct wl_closure *closure; struct wl_closure *closure;
struct wl_object **objectp, *object; struct wl_object **objectp, *object;
uint32_t length, *p, *start, size, *end; uint32_t length, aligned, *p, *start, size, *end;
int dup_fd; int dup_fd;
struct wl_array **arrayp, *array; struct wl_array **arrayp, *array;
const char **sp, *s; const char **sp, *s;
@ -497,7 +497,8 @@ wl_closure_vmarshal(struct wl_object *sender,
goto err_null; goto err_null;
length = s ? strlen(s) + 1: 0; length = s ? strlen(s) + 1: 0;
if (p + DIV_ROUNDUP(length, sizeof *p) + 1 > end) aligned = (length + 3) & ~3;
if (p + aligned / sizeof *p + 1 > end)
goto err; goto err;
*p++ = length; *p++ = length;
@ -507,7 +508,8 @@ wl_closure_vmarshal(struct wl_object *sender,
*sp = NULL; *sp = NULL;
memcpy(p, s, length); memcpy(p, s, length);
p += DIV_ROUNDUP(length, sizeof *p); memset((char *) p + length, 0, aligned - length);
p += aligned / sizeof *p;
break; break;
case 'o': case 'o':
closure->types[i] = &ffi_type_pointer; closure->types[i] = &ffi_type_pointer;