mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: do not send delete_id to a dead client

Browse source 
During client tear-down, all objects are destroyed in id order.
Therefore the display object is destroyed first.

If the destroy listeners of any object destroy another object by calling
wl_resoruce_destroy(), we try to send a delete_id event to the client.
This leads to a segmentation fault without a display object.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2011-11-29 14:32:32 +02:00
parent 42eed3235a
commit cf89b40c4c
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wayland-server.c
View file

@ -348,9 +348,11 @@ wl_resource_destroy(struct wl_resource *resource, uint32_t time)
struct wl_client *client = resource->client; struct wl_client *client = resource->client;
if (resource->object.id < WL_SERVER_ID_START) { if (resource->object.id < WL_SERVER_ID_START) {
wl_resource_queue_event(resource->client->display_resource, if (client->display_resource) {
wl_resource_queue_event(client->display_resource,
WL_DISPLAY_DELETE_ID, WL_DISPLAY_DELETE_ID,
resource->object.id); resource->object.id);
}
wl_map_insert_at(&client->objects, resource->object.id, NULL); wl_map_insert_at(&client->objects, resource->object.id, NULL);
} else { } else {
wl_map_remove(&client->objects, resource->object.id); wl_map_remove(&client->objects, resource->object.id);