AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

server: move memset after check

Browse Source 
If the malloc fails, memset would touch invalid memory.

Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Marek Chalupa 2014-08-06 11:28:34 +02:00 committed by Pekka Paalanen
parent e2c0d47b0c
commit a92efe9ad6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wayland-server.c
View File

@ -1141,10 +1141,11 @@ wl_display_add_socket_auto(struct wl_display *display)
const int MAX_DISPLAYNO = 32; const int MAX_DISPLAYNO = 32;
s = malloc(sizeof *s); s = malloc(sizeof *s);
memset(s, 0, sizeof *s);
if (s == NULL) if (s == NULL)
return NULL; return NULL;
memset(s, 0, sizeof *s);
do { do {
snprintf(display_name, sizeof display_name, "wayland-%d", displayno); snprintf(display_name, sizeof display_name, "wayland-%d", displayno);
if (wl_socket_init_for_display_name(s, display_name) < 0) { if (wl_socket_init_for_display_name(s, display_name) < 0) {