alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

input/seat: Clean up focus_stack in seat_destroy()

Browse source 
This fixes use-after-free when seat_destroy() has been called.
This commit is contained in:
Andri Yngvason 2020-12-28 02:53:43 +00:00 committed by Simon Ser
parent 98eece53ad
commit e11bc058ac
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/input/seat.c
View file

@ -46,11 +46,22 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
free(seat_device); free(seat_device);
} }
static void seat_node_destroy(struct sway_seat_node *seat_node) {
wl_list_remove(&seat_node->destroy.link);
wl_list_remove(&seat_node->link);
free(seat_node);
}
void seat_destroy(struct sway_seat *seat) { void seat_destroy(struct sway_seat *seat) {
struct sway_seat_device *seat_device, *next; struct sway_seat_device *seat_device, *next;
wl_list_for_each_safe(seat_device, next, &seat->devices, link) { wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
seat_device_destroy(seat_device); seat_device_destroy(seat_device);
} }
struct sway_seat_node *seat_node, *next_seat_node;
wl_list_for_each_safe(seat_node, next_seat_node, &seat->focus_stack,
link) {
seat_node_destroy(seat_node);
}
sway_input_method_relay_finish(&seat->im_relay); sway_input_method_relay_finish(&seat->im_relay);
sway_cursor_destroy(seat->cursor); sway_cursor_destroy(seat->cursor);
wl_list_remove(&seat->new_node.link); wl_list_remove(&seat->new_node.link);
@ -68,12 +79,6 @@ void seat_destroy(struct sway_seat *seat) {
free(seat); free(seat);
} }
static void seat_node_destroy(struct sway_seat_node *seat_node) {
wl_list_remove(&seat_node->destroy.link);
wl_list_remove(&seat_node->link);
free(seat_node);
}
void seat_idle_notify_activity(struct sway_seat *seat, void seat_idle_notify_activity(struct sway_seat *seat,
enum sway_input_idle_source source) { enum sway_input_idle_source source) {
uint32_t mask = seat->idle_inhibit_sources; uint32_t mask = seat->idle_inhibit_sources;