isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 11:00:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Handle NULL preedit text

Browse Source 
The preedit text may be NULL (eg. when unsetting it). This started
causing crashes since commit db9b60cc63, duh.

Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1132
This commit is contained in:
Carlos Garnacho 2020-03-24 16:52:55 +01:00 committed by Jonas Ådahl
parent 7fa7c2aeb7
commit 8592a8591b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wayland/meta-wayland-text-input.c
View File

@ -207,10 +207,12 @@ meta_wayland_text_input_focus_set_preedit_text (ClutterInputFocus *focus,
{ {
MetaWaylandTextInput *text_input; MetaWaylandTextInput *text_input;
struct wl_resource *resource; struct wl_resource *resource;
gsize pos; gsize pos = 0;
text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input; text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input;
pos = g_utf8_offset_to_pointer (text, cursor) - text;
if (text)
pos = g_utf8_offset_to_pointer (text, cursor) - text;
wl_resource_for_each (resource, &text_input->focus_resource_list) wl_resource_for_each (resource, &text_input->focus_resource_list)
{ {