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

screen-share: Avoid NULL dereference

Browse Source 
Don't try to dereference the seat if it's NULL.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Daniel Stone
2017-02-16 19:59:50 +00:00
committed by Bryce Harrington
parent a62d0468da
commit f81959e39d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/screen-share.c
+2 -1
View File
@@ -192,7 +192,7 @@ ss_seat_handle_keymap(void *data, struct wl_keyboard *wl_keyboard,
char *map_str; char *map_str;
if (!data) if (!data)
goto error; goto error_no_seat;
if (format == WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { if (format == WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
@@ -235,6 +235,7 @@ ss_seat_handle_keymap(void *data, struct wl_keyboard *wl_keyboard,
error: error:
wl_keyboard_release(seat->parent.keyboard); wl_keyboard_release(seat->parent.keyboard);
error_no_seat:
close(fd); close(fd);
} }