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

wayland-server: Free non-legacy wl_resource structs during wl_client_destroy

Browse source 
We need to free the non-legacy resources during client shutdown as well.
This commit is contained in:
Kristian Høgsberg 2013-07-02 16:59:44 -04:00
parent 477c7237e1
commit 3cff4693ea
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/wayland-server.c
View file

@ -422,11 +422,17 @@ static void
destroy_resource(void *element, void *data) destroy_resource(void *element, void *data)
{ {
struct wl_resource *resource = element; struct wl_resource *resource = element;
struct wl_client *client = resource->client;
uint32_t flags;
wl_signal_emit(&resource->destroy_signal, resource); wl_signal_emit(&resource->destroy_signal, resource);
flags = wl_map_lookup_flags(&client->objects, resource->object.id);
if (resource->destroy) if (resource->destroy)
resource->destroy(resource); resource->destroy(resource);
if (!(flags & WL_MAP_ENTRY_LEGACY))
free(resource);
} }
WL_EXPORT void WL_EXPORT void
@ -438,9 +444,6 @@ 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,