AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

imcontext: Improve compose table parsing

Browse Source 
Avoid leaking value in error cases, and actually
emit a warning for a missing quote. Pointed out
by Peter Bloomfield.
This commit is contained in:
Matthias Clasen 2021-02-15 01:41:09 -05:00
parent d2e074e36b
commit 2f43b8dc49
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkcomposetable.c
View File

@ -82,30 +82,34 @@ parse_compose_value (GtkComposeData *compose_data,
gunichar ch;
char *endp;
value = g_string_new ("");
if (val[0] != '"')
{
g_warning ("Only strings supported after ':': %s: %s", val, line);
goto fail;
}
value = g_string_new ("");
p = val + 1;
while (*p)
{
if (*p == '\0')
{
g_warning ("Missing closing '\"': %s: %s", val, line);
goto fail;
}
else if (*p == '\"')
if (*p == '\"')
{
p++;
while (*p && g_ascii_isspace (*p))
p++;
if (*p != '\0' && *p != '#')
g_warning ("Ignoring keysym after string: %s: %s", val, line);
break;
compose_data->value = g_string_free (value, FALSE);
return TRUE;
}
if (p[1] == '\0')
{
g_warning ("Missing closing '\"': %s: %s", val, line);
goto fail;
}
else if (*p == '\\')
{
@ -155,11 +159,9 @@ parse_compose_value (GtkComposeData *compose_data,
}
}
compose_data->value = g_string_free (value, FALSE);
return TRUE;
fail:
g_string_free (value, TRUE);
return FALSE;
}