mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-16 08:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/text_input: Fix crash on im destroy

Browse source 
Problem: Exiting input manager like fcitx5 causes sway to segfault

Solution: add null check.
This commit is contained in:
Furkan Sahin 2025-09-20 17:50:13 -04:00
parent b4a9a1716f
commit d4f59e3ddc
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sway/input/text_input.c
View file

@ -64,9 +64,13 @@ static void handle_im_commit(struct wl_listener *listener, void *data) {
static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *data) { static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *data) {
struct sway_input_method_relay *relay = wl_container_of(listener, relay, struct sway_input_method_relay *relay = wl_container_of(listener, relay,
input_method_keyboard_grab_destroy); input_method_keyboard_grab_destroy);
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = relay->input_method->keyboard_grab;
struct wlr_seat *wlr_seat = keyboard_grab->input_method->seat;
wl_list_remove(&relay->input_method_keyboard_grab_destroy.link); wl_list_remove(&relay->input_method_keyboard_grab_destroy.link);
// input_method may already be torn down; seat is compositor-owned
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab =
relay->input_method ? relay->input_method->keyboard_grab : NULL;
struct wlr_seat *wlr_seat = relay->seat ? relay->seat->wlr_seat : NULL;
if (!keyboard_grab || !wlr_seat)
return;
if (keyboard_grab->keyboard) { if (keyboard_grab->keyboard) {
// send modifier state to original client // send modifier state to original client