Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rendernode: Don't alloca() 8MB

Browse Source 
This happens when deserializing testcases and it really confuses
valgrind into thinking we're longjmp()ing.

And deserializing rendernodes is slow anyway, so who cares about a few
more malloc()s.
This commit is contained in:
Benjamin Otte
2018-02-03 16:05:01 +01:00
parent cf030e9ffc
commit 83a687f891
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gsk/gskrendernodeimpl.c
View File

@@ -2055,13 +2055,14 @@ gsk_container_node_deserialize (GVariant *variant,
gsize i, n_children;
guint32 child_type;
GVariant *child_variant;
GskRenderNode **children;
if (!check_variant_type (variant, GSK_CONTAINER_NODE_VARIANT_TYPE, error))
return NULL;
i = 0;
n_children = g_variant_iter_init (&iter, variant);
GskRenderNode **children = g_newa (GskRenderNode *, n_children);
children = g_new (GskRenderNode *, n_children);
while (g_variant_iter_loop (&iter, "(uv)", &child_type, &child_variant))
{
@@ -2071,6 +2072,7 @@ gsk_container_node_deserialize (GVariant *variant,
guint j;
for (j = 0; j < i; j++)
gsk_render_node_unref (children[j]);
g_free (children);
g_variant_unref (child_variant);
return NULL;
}
@@ -2081,6 +2083,7 @@ gsk_container_node_deserialize (GVariant *variant,
for (i = 0; i < n_children; i++)
gsk_render_node_unref (children[i]);
g_free (children);
return result;
}