Commit 97749170 authored by JeffyChen's avatar JeffyChen Committed by Daniel Stone

clients: Add more sanity checks to catch destroyed window

Add a sanity check to touch_handle_down() and data_device_enter() as
what we did for pointer and keyboard.
Signed-off-by: JeffyChen's avatarJeffy Chen <>
parent 179458ad
......@@ -3246,6 +3246,11 @@ touch_handle_down(void *data, struct wl_touch *wl_touch,
float sx = wl_fixed_to_double(x_w);
float sy = wl_fixed_to_double(y_w);
if (!surface) {
/* down event for a window we've just destroyed */
input->display->serial = serial;
input->touch_focus = wl_surface_get_user_data(surface);
if (!input->touch_focus) {
......@@ -3601,6 +3606,11 @@ data_device_enter(void *data, struct wl_data_device *data_device,
float y = wl_fixed_to_double(y_w);
char **p;
if (!surface) {
/* enter event for a window we've just destroyed */
window = wl_surface_get_user_data(surface);
input->drag_enter_serial = serial;
input->drag_focus = window,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment