AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

cssarrayvalue: Don't allocate memory when parsing array values

Browse Source 
We probably won't find CSS with more than 128 values in array.
This commit is contained in:
Timm Bäder 2020-01-08 08:58:07 +01:00
parent 8d15efba8f
commit 9cb2fe5cac
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkcssarrayvalue.c
View File

@ -411,25 +411,28 @@ _gtk_css_array_value_parse (GtkCssParser *parser,
GtkCssValue *(* parse_func) (GtkCssParser *parser))
{
GtkCssValue *value, *result;
GPtrArray *values;
values = g_ptr_array_new ();
GtkCssValue *values[128];
guint n_values = 0;
guint i;
do {
value = parse_func (parser);
if (value == NULL)
{
g_ptr_array_set_free_func (values, (GDestroyNotify) _gtk_css_value_unref);
g_ptr_array_free (values, TRUE);
for (i = 0; i < n_values; i ++)
_gtk_css_value_unref (values[i]);
return NULL;
}
g_ptr_array_add (values, value);
values[n_values] = value;
n_values ++;
if (G_UNLIKELY (n_values > G_N_ELEMENTS (values)))
g_error ("Only %d elements in a css array are allowed", (int)G_N_ELEMENTS (values));
} while (gtk_css_parser_try_token (parser, GTK_CSS_TOKEN_COMMA));
result = _gtk_css_array_value_new_from_array ((GtkCssValue **) values->pdata, values->len);
g_ptr_array_free (values, TRUE);
result = _gtk_css_array_value_new_from_array (values, n_values);
return result;
}