diff options
| author | Tyler Veness <calcmogul@gmail.com> | 2014-07-02 15:00:44 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2014-07-24 13:13:55 -0700 |
| commit | cf4c13af9821e33ce336709e01f8bbfebf77c8ed (patch) | |
| tree | 615108d5fea42983881b9c874cffe5bbb742344b /xwayland | |
| parent | 95ec0f95aa2df74c2da19e7dda24528fa8f765cc (diff) | |
| download | weston-cf4c13af9821e33ce336709e01f8bbfebf77c8ed.tar.gz | |
xwayland: set surface_id to 0 when client resource is found
When Xwayland requests that a wl_surface be created and the X event is
handled before the wayland requests, a surface ID is stored to
window->surface_id and the window is added to the unpaired window list. When
weston_wm_create_surface is called, the window is removed from the list and
window->surface_id is set to zero. If window->surface_id is not zero when
weston_wm_window_destroy is called, the window is assumed to be in the
unpaired window list and wl_list_remove is called. If
weston_wm_window_handle_surface_id is called and the surface has already
been created, the window is not added to the unpaired window list, but
window->surface_id isn't set to zero. When the window is destroyed, removing
the window from the list is attempted anyway and a crash occurs.
This patch stores the surface ID in a temporary variable and only assigns it
to window->surface_id when the window is added to the unpaired window list.
Otherwise window->surface_id is set to zero to maintain its use as a flag
variable.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=80273
Signed-off-by: Tyler Veness <calcmogul@gmail.com>
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/window-manager.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index 625a0e6b..0e4beb6a 100644 --- a/xwayland/window-manager.c +++ b/xwayland/window-manager.c @@ -1371,14 +1371,17 @@ weston_wm_window_handle_surface_id(struct weston_wm_window *window, * hasn't been created yet. In that case put the window on * the unpaired window list and continue when the surface gets * created. */ - window->surface_id = client_message->data.data32[0]; - resource = wl_client_get_object(wm->server->client, - window->surface_id); - if (resource) + uint32_t surface = client_message->data.data32[0]; + resource = wl_client_get_object(wm->server->client, surface); + if (resource) { + window->surface_id = 0; xserver_map_shell_surface(window, wl_resource_get_user_data(resource)); - else + } + else { + window->surface_id = surface; wl_list_insert(&wm->unpaired_window_list, &window->link); + } } static void |