diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2013-06-18 12:42:40 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-06-20 15:12:26 -0400 |
| commit | 96afa347762bd9796288e8052ccc42989a68386d (patch) | |
| tree | 931e054ac8b9cc8da491d08999b4436d3079d0b5 | |
| parent | 7094441b1d1ad15e7e0121410d23c3e94731a805 (diff) | |
Free non-legacy resources inside wl_resource_destroy
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>
| -rw-r--r-- | src/wayland-server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wayland-server.c b/src/wayland-server.c index e2776ff..28a10cc 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -429,6 +429,9 @@ wl_resource_destroy(struct wl_resource *resource) id = resource->object.id; 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 (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); resource->client = client; - resource->destroy = (void *) free; + resource->destroy = NULL; if (wl_map_insert_at(&client->objects, 0, resource->object.id, resource) < 0) { wl_resource_post_error(client->display_resource, |