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

compositor: fix memory corruption when removing an output

Browse Source 
The destructor set on the wl_output resources needs the weston_output
to be allocated, because it removes the resource from its list.
So unset the destructor on all the resources when destroying an
output.

Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Giulio Camuffo
2014-09-06 16:18:02 +03:00
committed by Pekka Paalanen
parent 03faed2074
commit 00535ce6b4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+6
View File
@@ -3248,6 +3248,8 @@ weston_compositor_remove_output(struct weston_compositor *compositor,
WL_EXPORT void WL_EXPORT void
weston_output_destroy(struct weston_output *output) weston_output_destroy(struct weston_output *output)
{ {
struct wl_resource *resource;
output->destroying = 1; output->destroying = 1;
weston_compositor_remove_output(output->compositor, output); weston_compositor_remove_output(output->compositor, output);
@@ -3261,6 +3263,10 @@ weston_output_destroy(struct weston_output *output)
pixman_region32_fini(&output->previous_damage); pixman_region32_fini(&output->previous_damage);
output->compositor->output_id_pool &= ~(1 << output->id); output->compositor->output_id_pool &= ~(1 << output->id);
wl_resource_for_each(resource, &output->resource_list) {
wl_resource_set_destructor(resource, NULL);
}
wl_global_destroy(output->global); wl_global_destroy(output->global);
} }