From d8d4701864e8a0e5a1c97e12478d485e814d9941 Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Tue, 6 May 2014 14:50:03 -0700 Subject: [PATCH] compositor-wayland: avoid possible NULL deref in handle_keymap If data is NULL, then we jumped to error which attempts to dereference data. Instead, just close(fd) and return when data is NULL. Signed-off-by: U. Artie Eoff --- src/compositor-wayland.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 3cd308f..a08b71a 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -1424,8 +1424,10 @@ input_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format, struct xkb_keymap *keymap; char *map_str; - if (!data) - goto error; + if (!data) { + close(fd); + return; + } if (format == WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); -- 2.7.4