mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: remove surface listener when surface is destroyed

Browse Source 
There may be race condition between destroying surface and destroying
output. If handle_output_destroy() is called after surface is destroyed,
illegal memory access occurs when surface destroy signals is
unregistered from the panel/background. This patch fixes this issue and
removes unnecessary initialization for panel surface listener.

Signed-off-by: Tomohito Esaki <etom@igel.co.jp>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Tomohito Esaki 2018-01-31 15:15:45 +09:00 committed by Pekka Paalanen
parent 551b805430
commit bf31f6cfb9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desktop-shell/shell.c
View File

@ -2939,6 +2939,7 @@ handle_background_surface_destroy(struct wl_listener *listener, void *data)
container_of(listener, struct shell_output, background_surface_listener);
weston_log("background surface gone\n");
wl_list_remove(&output->background_surface_listener.link);
output->background_surface = NULL;
}
@ -3023,6 +3024,7 @@ handle_panel_surface_destroy(struct wl_listener *listener, void *data)
container_of(listener, struct shell_output, panel_surface_listener);
weston_log("panel surface gone\n");
wl_list_remove(&output->panel_surface_listener.link);
output->panel_surface = NULL;
}
@ -4714,8 +4716,10 @@ handle_output_destroy(struct wl_listener *listener, void *data)
shell_for_each_layer(shell, shell_output_destroy_move_layer, output);
wl_list_remove(&output_listener->panel_surface_listener.link);
wl_list_remove(&output_listener->background_surface_listener.link);
if (output_listener->panel_surface)
wl_list_remove(&output_listener->panel_surface_listener.link);
if (output_listener->background_surface)
wl_list_remove(&output_listener->background_surface_listener.link);
wl_list_remove(&output_listener->destroy_listener.link);
wl_list_remove(&output_listener->link);
free(output_listener);
@ -4761,7 +4765,6 @@ create_shell_output(struct desktop_shell *shell,
shell_output->output = output;
shell_output->shell = shell;
shell_output->destroy_listener.notify = handle_output_destroy;
wl_list_init(&shell_output->panel_surface_listener.link);
wl_signal_add(&output->destroy_signal,
&shell_output->destroy_listener);
wl_list_insert(shell->output_list.prev, &shell_output->link);