mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xwm: Fix a weston crash when a window surface is created after unmap 

If windows are created and quickly destroyed it's possible that they'll be
on the unpaired window list at the time of surface creation.  The surface
destroy listener for that surface isn't properly freed and a crash happens
some time later.

This patch removes the window from the unpaired list during unmap, so we
should never get to the destroy handler with a surface destroy listener set.

Just in case there's another path to that failure, I've also removed the
surface destroy listener in the destory handler.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Acked-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Derek Foreman 2015-04-09 14:48:22 -05:00 committed by Pekka Paalanen
parent 90f23ca3f4
commit 9a0b2b54e2
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xwayland/window-manager.c
View File

@ -1001,6 +1001,14 @@ weston_wm_handle_unmap_notify(struct weston_wm *wm, xcb_generic_event_t *event)
if (!wm_lookup_window(wm, unmap_notify->window, &window))
return;
if (window->surface_id) {
/* Make sure we're not on the unpaired surface list or we
* could be assigned a surface during surface creation that
* was mapped before this unmap request.
*/
wl_list_remove(&window->link);
window->surface_id = 0;
}
if (wm->focus_window == window)
wm->focus_window = NULL;
if (window->surface)
@ -1207,6 +1215,9 @@ weston_wm_window_destroy(struct weston_wm_window *window)
if (window->surface_id)
wl_list_remove(&window->link);
if (window->surface)
wl_list_remove(&window->surface_destroy_listener.link);
hash_table_remove(window->wm->window_hash, window->id);
free(window);
}