nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

validate utf8 strings before using them

Browse source
This commit is contained in:
Dana Jansens 2003-05-23 18:56:33 +00:00
parent b46222c3d9
commit f68eb1fc25
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
openbox/prop.c
View file

@ -306,12 +306,17 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
gboolean prop_get_string_utf8(Window win, Atom prop, char **ret) gboolean prop_get_string_utf8(Window win, Atom prop, char **ret)
{ {
char *raw; char *raw;
char *str;
guint num; guint num;
if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) { if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
*ret = g_strndup(raw, num); /* grab the first string from the list */ str = g_strndup(raw, num); /* grab the first string from the list */
g_free(raw); g_free(raw);
return TRUE; if (g_utf8_validate(str, -1, NULL)) {
*ret = str;
return TRUE;
}
g_free(str);
} }
return FALSE; return FALSE;
} }
@ -327,7 +332,10 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret)
p = raw; p = raw;
for (i = 0; i < num; ++i) { for (i = 0; i < num; ++i) {
(*ret)[i] = g_strdup(p); if (g_utf8_validate(p, -1, NULL))
(*ret)[i] = g_strdup(p);
else
(*ret)[i] = g_strdup("");
p += strlen(p) + 1; p += strlen(p) + 1;
} }
g_free(raw); g_free(raw);