mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Free non-legacy resources inside wl_resource_destroy

Browse source 
This commit makes wl_resource_destroy automatically free all non-legacy
resource structures.  Since wl_resource is now an opaque structure it
doesn't make sense for the clients to be freeing it.  This checks to make
sure that it was added through wl_client_add_object or wl_client_new_object
and not wl_client_add_resource before it frees it.  This way if it is a
legacy resources embedded in a structure somewhere we don't have an invalid
free.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand 2013-06-18 12:42:40 -05:00 • committed by Kristian Høgsberg
parent 7094441b1d
commit 96afa34776
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/wayland-server.c
View file

@ -429,6 +429,9 @@ wl_resource_destroy(struct wl_resource *resource)
id = resource->object.id; id = resource->object.id;
destroy_resource(resource, NULL); destroy_resource(resource, NULL);
if (!(wl_map_lookup_flags(&client->objects, id) & WL_MAP_ENTRY_LEGACY))
free(resource);
if (id < WL_SERVER_ID_START) { if (id < WL_SERVER_ID_START) {
if (client->display_resource) { if (client->display_resource) {
wl_resource_queue_event(client->display_resource, wl_resource_queue_event(client->display_resource,
@ -986,7 +989,7 @@ wl_client_add_object(struct wl_client *client,
wl_resource_init(resource, interface, implementation, id, data); wl_resource_init(resource, interface, implementation, id, data);
resource->client = client; resource->client = client;
resource->destroy = (void *) free; resource->destroy = NULL;
if (wl_map_insert_at(&client->objects, 0, resource->object.id, resource) < 0) { if (wl_map_insert_at(&client->objects, 0, resource->object.id, resource) < 0) {
wl_resource_post_error(client->display_resource, wl_resource_post_error(client->display_resource,