brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xprops: Validate text properties that claim to be UTF8

Browse Source 
Some clients such as mpv might set the WM_TITLE as a UTF8_STRING based
on some unconverted/unvalidated metadata that is not actually UTF8. This
would then be set as the title of a MetaWindow (in the absence of a
valid UTF8 _NET_WM_TITLE). The shell then tries to use this window title
for things like the overview or the window switcher where it would
trigger an UTF8 validation error and leave the shell in an unusable
state.

Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1794
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1850>
This commit is contained in:
Sebastian Keller 2021-05-04 01:42:58 +02:00 committed by Marge Bot
parent 64c9c9c5b0
commit e423653017
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/x11/xprops.c
View File

@ -620,7 +620,7 @@ meta_prop_get_cardinal_with_atom_type (MetaX11Display *x11_display,
}
static char *
text_property_to_utf8 (Display *xdisplay,
text_property_to_utf8 (GetPropertyResults *results,
const XTextProperty *prop)
{
char *ret = NULL;
@ -629,7 +629,8 @@ text_property_to_utf8 (Display *xdisplay,
int count = 0;
int res;
res = XmbTextPropertyToTextList (xdisplay, prop, &local_list, &count);
res = XmbTextPropertyToTextList (results->x11_display->xdisplay, prop,
&local_list, &count);
if (res == XNoMemory || res == XLocaleNotSupported || res == XConverterNotFound)
goto out;
@ -637,9 +638,26 @@ text_property_to_utf8 (Display *xdisplay,
goto out;
if (g_get_charset (&charset))
ret = g_strdup (local_list[0]);
{
if (!g_utf8_validate (local_list[0], -1, NULL))
{
char *name;
meta_x11_error_trap_push (results->x11_display);
name = XGetAtomName (results->x11_display->xdisplay, results->xatom);
meta_x11_error_trap_pop (results->x11_display);
meta_warning ("Property %s on window 0x%lx contained invalid UTF-8",
name, results->xwindow);
meta_XFree (name);
goto out;
}
ret = g_strdup (local_list[0]);
}
else
ret = g_convert (local_list[0], -1, "UTF-8", charset, NULL, NULL, NULL);
{
ret = g_convert (local_list[0], -1, "UTF-8", charset, NULL, NULL, NULL);
}
out:
XFreeStringList (local_list);
@ -659,7 +677,7 @@ text_property_from_results (GetPropertyResults *results,
tp.format = results->format;
tp.nitems = results->n_items;
*utf8_str_p = text_property_to_utf8 (results->x11_display->xdisplay, &tp);
*utf8_str_p = text_property_to_utf8 (results, &tp);
g_clear_pointer (&results->prop, g_free);