diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2014-12-11 15:44:46 -0600 |
---|---|---|
committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-12-19 14:27:05 +0200 |
commit | 99bfa6479902193b93a865030056ea98c2ee72a7 (patch) | |
tree | 8d868922b02a115ffb95a3230ea1bdf3ff6c48fd | |
parent | e784e342287f4611e6782993ea61ebfb0eded994 (diff) | |
download | weston-99bfa6479902193b93a865030056ea98c2ee72a7.tar.gz |
compositor-x11: Fix some shutdown crashes
The assertion in x11_compositor_find_output() can trigger during normal
shutdown, for example, when moving the mouse while hitting a hotkey to
close the weston window.
Instead we can remove the assert(), return NULL, and discard events
we can't find a destination output for.
v2 Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
v1 Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r-- | src/compositor-x11.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c index a760f337..29f21192 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -920,7 +920,7 @@ x11_compositor_find_output(struct x11_compositor *c, xcb_window_t window) return output; } - assert(0); + return NULL; } static void @@ -929,7 +929,8 @@ x11_compositor_delete_window(struct x11_compositor *c, xcb_window_t window) struct x11_output *output; output = x11_compositor_find_output(c, window); - x11_output_destroy(&output->base); + if (output) + x11_output_destroy(&output->base); xcb_flush(c->conn); @@ -992,6 +993,8 @@ x11_compositor_deliver_button_event(struct x11_compositor *c, struct x11_output *output; output = x11_compositor_find_output(c, button_event->event); + if (!output) + return; if (state) xcb_grab_pointer(c->conn, 0, output->window, @@ -1070,6 +1073,9 @@ x11_compositor_deliver_motion_event(struct x11_compositor *c, if (!c->has_xkb) update_xkb_state_from_core(c, motion_notify->state); output = x11_compositor_find_output(c, motion_notify->event); + if (!output) + return; + weston_output_transform_coordinate(&output->base, wl_fixed_from_int(motion_notify->event_x), wl_fixed_from_int(motion_notify->event_y), @@ -1096,6 +1102,9 @@ x11_compositor_deliver_enter_event(struct x11_compositor *c, if (!c->has_xkb) update_xkb_state_from_core(c, enter_notify->state); output = x11_compositor_find_output(c, enter_notify->event); + if (!output) + return; + weston_output_transform_coordinate(&output->base, wl_fixed_from_int(enter_notify->event_x), wl_fixed_from_int(enter_notify->event_y), &x, &y); @@ -1245,6 +1254,9 @@ x11_compositor_handle_event(int fd, uint32_t mask, void *data) case XCB_EXPOSE: expose = (xcb_expose_event_t *) event; output = x11_compositor_find_output(c, expose->window); + if (!output) + break; + weston_output_damage(&output->base); weston_output_schedule_repaint(&output->base); break; |