From 9f42e50868279e6fed5be1f34acad44b1292e29a Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Tue, 13 Aug 2013 11:42:02 +0200 Subject: [PATCH] xwm: do not crash when activating a NULL surface --- src/xwayland/window-manager.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c index d565888..4c9d477 100644 --- a/src/xwayland/window-manager.c +++ b/src/xwayland/window-manager.c @@ -610,11 +610,15 @@ static void weston_wm_window_activate(struct wl_listener *listener, void *data) { struct weston_surface *surface = data; - struct weston_wm_window *window = get_wm_window(surface); + struct weston_wm_window *window = NULL; struct weston_wm *wm = container_of(listener, struct weston_wm, activate_listener); xcb_client_message_event_t client_message; + if (surface) { + window = get_wm_window(surface); + } + if (window) { client_message.response_type = XCB_CLIENT_MESSAGE; client_message.format = 32; -- 2.7.4