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

Fix server crash when a client dies during a drag with an icon

Browse source 
If a client dies during a drag that it started using an icon surface,
the server could crash because the icon surface is not valid anymore.

Fix this by using a destroy listener to reset device->drag_surface to
nil when the surface is destroyed.
This commit is contained in:
Ander Conselvan de Oliveira 2012-03-01 14:09:42 +02:00 • committed by Kristian Høgsberg
parent cb3e102620
commit e7f6c509e2
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/data-device.c
View file

@ -253,6 +253,7 @@ drag_grab_button(struct wl_pointer_grab *grab,
implementation->attach(surface_resource->client, implementation->attach(surface_resource->client,
surface_resource, NULL, 0, 0); surface_resource, NULL, 0, 0);
wl_list_remove(&device->drag_icon_listener.link);
} }
device->drag_data_source = NULL; device->drag_data_source = NULL;
@ -266,6 +267,18 @@ static const struct wl_pointer_grab_interface drag_grab_interface = {
drag_grab_button, drag_grab_button,
}; };
static void
destroy_data_device_icon(struct wl_listener *listener,
struct wl_resource *resource, uint32_t time)
{
struct wl_input_device *device;
device = container_of(listener, struct wl_input_device,
drag_icon_listener);
device->drag_surface = NULL;
}
static void static void
data_device_start_drag(struct wl_client *client, struct wl_resource *resource, data_device_start_drag(struct wl_client *client, struct wl_resource *resource,
struct wl_resource *source_resource, struct wl_resource *source_resource,
@ -282,8 +295,12 @@ data_device_start_drag(struct wl_client *client, struct wl_resource *resource,
device->drag_grab.interface = &drag_grab_interface; device->drag_grab.interface = &drag_grab_interface;
device->drag_data_source = source_resource->data; device->drag_data_source = source_resource->data;
if (icon_resource) if (icon_resource) {
device->drag_surface = icon_resource->data; device->drag_surface = icon_resource->data;
device->drag_icon_listener.func = destroy_data_device_icon;
wl_list_insert(icon_resource->destroy_listener_list.prev,
&device->drag_icon_listener.link);
}
wl_input_device_start_pointer_grab(device, &device->drag_grab, time); wl_input_device_start_pointer_grab(device, &device->drag_grab, time);
} }

1
src/wayland-server.h
View file

@ -232,6 +232,7 @@ struct wl_input_device {
struct wl_listener drag_focus_listener; struct wl_listener drag_focus_listener;
struct wl_pointer_grab drag_grab; struct wl_pointer_grab drag_grab;
struct wl_surface *drag_surface; struct wl_surface *drag_surface;
struct wl_listener drag_icon_listener;
struct wl_data_source *selection_data_source; struct wl_data_source *selection_data_source;
struct wl_listener selection_data_source_listener; struct wl_listener selection_data_source_listener;