From: Pekka Paalanen <pekka.paala...@collabora.co.uk>
Remove the wl_resource in the head's resource list when we are
removing the wl_output global. We sent global removal events to clients,
the resources should become dummies until clients reap them. Reset user
data so that clients triying to use dummy objects don't hit e.g. a freed
head pointer.
This fixes a theoretical issue: if an enabled output is disabled and
then gets enabled again, mode changes and wl_surface.enter/leave would
still attempt to use the dummy objects. If a client destroyed a dummy
object, we don't have the destructor to remove it from the resource
list, and libweston would hit freed memory.
Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
---
libweston/compositor.c | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/libweston/compositor.c b/libweston/compositor.c
index efa961dc..d314f2d5 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -4374,6 +4374,28 @@ bind_output(struct wl_client *client,
wl_output_send_done(resource);
}
+/** Remove the global wl_output protocol object
+ *
+ * \param head The head whose global to remove.
+ *
+ * Also orphans the wl_resources for this head (wl_output).
+ */
+static void
+weston_head_remove_global(struct weston_head *head)
+{
+ struct wl_resource *resource, *tmp;
+
+ if (head->global)
+ wl_global_destroy(head->global);
+ head->global = NULL;
+
+ wl_resource_for_each_safe(resource, tmp, &head->resource_list) {
+ unbind_resource(resource);
+ wl_resource_set_destructor(resource, NULL);
+ wl_resource_set_user_data(resource, NULL);
+ }
+}
+
/** Get the backing object of wl_output
*
* \param resource A wl_output protocol object.
@@ -4823,7 +4845,6 @@ static void
weston_compositor_remove_output(struct weston_output *output)
{
struct weston_compositor *compositor = output->compositor;
- struct wl_resource *resource;
struct weston_view *view;
struct weston_head *head;
@@ -4846,13 +4867,8 @@ weston_compositor_remove_output(struct weston_output
*output)
wl_signal_emit(&compositor->output_destroyed_signal, output);
wl_signal_emit(&output->destroy_signal, output);
- wl_list_for_each(head, &output->head_list, output_link) {
- wl_global_destroy(head->global);
- head->global = NULL;
-
- wl_resource_for_each(resource, &head->resource_list)
- wl_resource_set_destructor(resource, NULL);
- }
+ wl_list_for_each(head, &output->head_list, output_link)
+ weston_head_remove_global(head);
compositor->output_id_pool &= ~(1u << output->id);
output->id = 0xffffffff; /* invalid */
--
2.13.6
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel
