mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-20 06:47:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/text_input: fix crash when using im

Browse source 
Problem: wlroots api changed to pass NULL for the callback and stores
the input_method in the relay. sway tries to dereference the null ptr.

Solution: get im from relay, ignore `*data`
This commit is contained in:
Furkan Sahin 2025-09-13 18:26:44 -04:00
parent 50a8750e01
commit b88eaae6ba
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sway/input/text_input.c
View file

@ -42,8 +42,7 @@ static void handle_im_commit(struct wl_listener *listener, void *data) {
if (!text_input) { if (!text_input) {
return; return;
} }
struct wlr_input_method_v2 *context = data; struct wlr_input_method_v2 *context = relay->input_method;
assert(context == relay->input_method);
if (context->current.preedit.text) { if (context->current.preedit.text) {
wlr_text_input_v3_send_preedit_string(text_input->input, wlr_text_input_v3_send_preedit_string(text_input->input,
context->current.preedit.text, context->current.preedit.text,
@ -110,8 +109,6 @@ static void text_input_set_pending_focused_surface(
static void handle_im_destroy(struct wl_listener *listener, void *data) { static void handle_im_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_destroy); input_method_destroy);
struct wlr_input_method_v2 *context = data;
assert(context == relay->input_method);
wl_list_remove(&relay->input_method_commit.link); wl_list_remove(&relay->input_method_commit.link);
wl_list_remove(&relay->input_method_grab_keyboard.link); wl_list_remove(&relay->input_method_grab_keyboard.link);
wl_list_remove(&relay->input_method_destroy.link); wl_list_remove(&relay->input_method_destroy.link);