commit e5a320837319ed91868b9e4311150527847db9f4
author Dima Ryazanov <dima@gmail.com> Fri Nov 15 02:01:18 2013 -0800
committer Kristian Høgsberg <krh@bitplanet.net> Tue Dec 03 15:54:44 2013 -0800
tree e4c79f599e66911cb4e14f0bded0c780e7d6cd1f
parent 767d891c35f396cb90b298e0ae782ce80a0ad6c8

Set the view to NULL when unmapping an X11 window

Fixes a crash caused by accessing a deleted view in weston_wm_window_schedule_repaint. It can be easily reproduced by switching between menus in Firefox.

Signed-off-by: Dima Ryazanov <dima@gmail.com>

src/xwayland/window-manager.c

diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index b2776a0..5ee9480 100644
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -902,6 +902,7 @@
 		wl_list_remove(&window->surface_destroy_listener.link);
 	window->surface = NULL;
 	window->shsurf = NULL;
+	window->view = NULL;
 	xcb_unmap_window(wm->conn, window->frame_id);
 }
 
@@ -2028,6 +2029,7 @@
        Don't try to use it later. */
 	window->shsurf = NULL;
 	window->surface = NULL;
+	window->view = NULL;
 }
 
 static struct weston_wm_window *