hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1111 from martinetd/wlr-seat-destroy 

wlr_seat destroy: fix use-after-free when destroying clients
This commit is contained in:
Drew DeVault 2018-07-04 06:41:10 -07:00 committed by GitHub
parent 12dd9544f9 48e8da851d
commit b0f7072737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
types/seat/wlr_seat.c
View File

@ -175,10 +175,18 @@ void wlr_seat_destroy(struct wlr_seat *seat) {
struct wlr_seat_client *client, *tmp;
wl_list_for_each_safe(client, tmp, &seat->clients, link) {
struct wl_resource *resource, *next_resource;
wl_resource_for_each_safe(resource, next_resource, &client->wl_resources) {
struct wl_resource *resource, *next;
/* wl_resource_for_each_safe isn't safe to use here, because the last
* wl_resource_destroy will also destroy the head we cannot do the last
* 'next' update that usually is harmless here.
* Work around this by breaking one step ahead
*/
wl_resource_for_each_safe(resource, next, &client->wl_resources) {
// will destroy other resources as well
wl_resource_destroy(resource);
if (wl_resource_get_link(next) == &client->wl_resources) {
break;
}
}
}