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

tests: check for NULL surface in keyboard and pointer handlers

Browse Source 
When a test destroys a wl_surface, it is still possible to get events
referring to the destroyed surface. The surface in such cases will be
NULL.

Handle NULL surface gracefully in keyboard and pointer enter/leave
handlers. Touch-down handler is already NULL-safe.

This fixes a SEGV in a test I am writing for wp_viewport.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Pekka Paalanen 2016-04-21 16:47:20 +03:00
parent 13a26e02e5
commit fd01ba055d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/weston-test-client-helper.c
View File

@ -132,7 +132,11 @@ pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
{
struct pointer *pointer = data;
pointer->focus = wl_surface_get_user_data(wl_surface);
if (wl_surface)
pointer->focus = wl_surface_get_user_data(wl_surface);
else
pointer->focus = NULL;
pointer->x = wl_fixed_to_int(x);
pointer->y = wl_fixed_to_int(y);
@ -149,7 +153,7 @@ pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,
pointer->focus = NULL;
fprintf(stderr, "test-client: got pointer leave, surface %p\n",
wl_surface_get_user_data(wl_surface));
wl_surface ? wl_surface_get_user_data(wl_surface) : NULL);
}
static void
@ -243,7 +247,10 @@ keyboard_handle_enter(void *data, struct wl_keyboard *wl_keyboard,
{
struct keyboard *keyboard = data;
keyboard->focus = wl_surface_get_user_data(wl_surface);
if (wl_surface)
keyboard->focus = wl_surface_get_user_data(wl_surface);
else
keyboard->focus = NULL;
fprintf(stderr, "test-client: got keyboard enter, surface %p\n",
keyboard->focus);
@ -258,7 +265,7 @@ keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard,
keyboard->focus = NULL;
fprintf(stderr, "test-client: got keyboard leave, surface %p\n",
wl_surface_get_user_data(wl_surface));
wl_surface ? wl_surface_get_user_data(wl_surface) : NULL);
}
static void