Skip to content

guard seat_get_focus() NULL dereferences #9055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hack-heart wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −5
Open

guard seat_get_focus() NULL dereferences #9055

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef26f9
guard seat_get_focus() NULL dereferences
hack-heart Mar 1, 2026
8420113
set has_focus to false when focus is NULL
hack-heart Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions sway/input/seat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,10 +1136,12 @@ static void seat_set_workspace_focus(struct sway_seat *seat, struct sway_node *n

if (node == NULL) {
// Close any popups on the old focus
if (node_is_view(last_focus)) {
view_close_popups(last_focus->sway_container->view);
if (last_focus) {
if (node_is_view(last_focus)) {
view_close_popups(last_focus->sway_container->view);
}
seat_send_unfocus(last_focus, seat);
}
seat_send_unfocus(last_focus, seat);
sway_input_method_relay_set_focus(&seat->im_relay, NULL);
seat->has_focus = false;
return;
Expand Down Expand Up @@ -1291,7 +1293,9 @@ void seat_set_focus_surface(struct sway_seat *seat,
struct wlr_surface *surface, bool unfocus) {
if (seat->has_focus && unfocus) {
struct sway_node *focus = seat_get_focus(seat);
seat_send_unfocus(focus, seat);
if (focus) {
seat_send_unfocus(focus, seat);
}
seat->has_focus = false;
}

Expand Down Expand Up @@ -1340,7 +1344,9 @@ void seat_unfocus_unless_client(struct sway_seat *seat, struct wl_client *client
}
if (seat->has_focus) {
struct sway_node *focus = seat_get_focus(seat);
if (node_is_view(focus) && wl_resource_get_client(
if (!focus) {
seat->has_focus = false;
} else if (node_is_view(focus) && wl_resource_get_client(
focus->sway_container->view->surface->resource) != client) {
seat_set_focus(seat, NULL);
}
Expand Down