From f81959e39d8fd6835a55417496ec17696e3661db Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 16 Feb 2017 19:59:50 +0000 Subject: [PATCH] screen-share: Avoid NULL dereference Don't try to dereference the seat if it's NULL. Signed-off-by: Daniel Stone Reviewed-by: Bryce Harrington --- compositor/screen-share.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compositor/screen-share.c b/compositor/screen-share.c index bcb9defa..069da1db 100644 --- a/compositor/screen-share.c +++ b/compositor/screen-share.c @@ -192,7 +192,7 @@ ss_seat_handle_keymap(void *data, struct wl_keyboard *wl_keyboard, char *map_str; if (!data) - goto error; + goto error_no_seat; if (format == WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { 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: wl_keyboard_release(seat->parent.keyboard); +error_no_seat: close(fd); }