hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 21:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

text-input/input-method: handle strdup() failure

Browse source
This commit is contained in:
Isaac Freund 2021-11-07 20:34:24 +01:00
parent eb5f23d6d0
commit e326b76959
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
types/wlr_input_method_v2.c
View file

@ -88,6 +88,10 @@ static void im_commit_string(struct wl_client *client,
} }
free(input_method->pending.commit_text); free(input_method->pending.commit_text);
input_method->pending.commit_text = strdup(text); input_method->pending.commit_text = strdup(text);
if (input_method->pending.commit_text == NULL) {
wl_client_post_no_memory(client);
return;
}
} }
static void im_set_preedit_string(struct wl_client *client, static void im_set_preedit_string(struct wl_client *client,
@ -102,6 +106,10 @@ static void im_set_preedit_string(struct wl_client *client,
input_method->pending.preedit.cursor_end = cursor_end; input_method->pending.preedit.cursor_end = cursor_end;
free(input_method->pending.preedit.text); free(input_method->pending.preedit.text);
input_method->pending.preedit.text = strdup(text); input_method->pending.preedit.text = strdup(text);
if (input_method->pending.preedit.text == NULL) {
wl_client_post_no_memory(client);
return;
}
} }
static void im_delete_surrounding_text(struct wl_client *client, static void im_delete_surrounding_text(struct wl_client *client,

4
types/wlr_text_input_v3.c
View file

@ -171,6 +171,10 @@ static void text_input_commit(struct wl_client *client,
if (text_input->pending.surrounding.text) { if (text_input->pending.surrounding.text) {
text_input->current.surrounding.text = text_input->current.surrounding.text =
strdup(text_input->pending.surrounding.text); strdup(text_input->pending.surrounding.text);
if (text_input->current.surrounding.text == NULL) {
wl_client_post_no_memory(client);
return;
}
} }
bool old_enabled = text_input->current_enabled; bool old_enabled = text_input->current_enabled;