diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2021-01-05 12:46:48 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-01-05 13:53:58 +0100 |
| commit | bf926e31a0bda9f621eb25ffe77046d171e48b13 (patch) | |
| tree | f88519ef31ce01fb8cbf8b1c6ef1c8d42c85c9ba | |
| parent | d3047011d06867269f5df88285d62729ac0646e1 (diff) | |
primary selection: destroy devices before manager
Since device_destroy() calls wl_list_remove() on the device's link,
the manager must still be valid. However if the manager is destroyed
before the seat as the wl_display destroy handlers are called, devices
listening for the seat to be destroyed will access free'd memory in
wl_list_remove().
| -rw-r--r-- | types/wlr_primary_selection_v1.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/types/wlr_primary_selection_v1.c b/types/wlr_primary_selection_v1.c index e5f2d01c..009b0955 100644 --- a/types/wlr_primary_selection_v1.c +++ b/types/wlr_primary_selection_v1.c @@ -452,6 +452,12 @@ static void primary_selection_device_manager_bind(struct wl_client *client, static void handle_display_destroy(struct wl_listener *listener, void *data) { struct wlr_primary_selection_v1_device_manager *manager = wl_container_of(listener, manager, display_destroy); + + struct wlr_primary_selection_v1_device *device, *tmp; + wl_list_for_each_safe(device, tmp, &manager->devices, link) { + device_destroy(device); + } + wlr_signal_emit_safe(&manager->events.destroy, manager); wl_list_remove(&manager->display_destroy.link); wl_global_destroy(manager->global); |