From 2c40d1d30eabe46706822a8b5c94579aeba58e84 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 2 Feb 2016 10:18:48 -0800 Subject: [PATCH] input: Fix crash when touchscreen generates out of screen coordinate With change 61ed7b6b, global touch coordinates are being passed to the touch grab. However, touch->grab is undefined in certain circumstances such as when the touch screen raises an axis X value larger than the maximum expected. Move the check for this condition earlier, before our first use of the pointer. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=92736 Reviewed-by: Bryce Harrington Reviewed-by: Derek Foreman --- src/input.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/input.c b/src/input.c index 2539fa7..8c106dd 100644 --- a/src/input.c +++ b/src/input.c @@ -446,11 +446,14 @@ default_grab_touch_down(struct weston_touch_grab *grab, uint32_t time, struct wl_list *resource_list; wl_fixed_t sx, sy; + if (!touch->focus) + return; + weston_view_from_global_fixed(touch->focus, x, y, &sx, &sy); resource_list = &touch->focus_resource_list; - if (!wl_list_empty(resource_list) && touch->focus) { + if (!wl_list_empty(resource_list)) { serial = wl_display_next_serial(display); wl_resource_for_each(resource, resource_list) wl_touch_send_down(resource, serial, time, -- 2.7.4