isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl-primitives: Plug some leaks in cogl_polygon

Browse Source 
cogl_polygon creates some temporary strings, CoglAttributeBuffers and
CoglAttributes but it was never freeing them.

Based on a patch by Florian Renaut

https://bugzilla.gnome.org/show_bug.cgi?id=655556

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-07-29 17:24:10 +01:00
parent 38deb97478
commit bbbe6db284
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cogl/cogl-primitives.c
View File

@ -1086,7 +1086,7 @@ cogl_polygon (const CoglTextureVertex *vertices,
for (i = 0; i < n_layers; i++) for (i = 0; i < n_layers; i++)
{ {
const char *names[] = { static const char *names[] = {
"cogl_tex_coord0_in", "cogl_tex_coord0_in",
"cogl_tex_coord1_in", "cogl_tex_coord1_in",
"cogl_tex_coord2_in", "cogl_tex_coord2_in",
@ -1096,8 +1096,13 @@ cogl_polygon (const CoglTextureVertex *vertices,
"cogl_tex_coord6_in", "cogl_tex_coord6_in",
"cogl_tex_coord7_in" "cogl_tex_coord7_in"
}; };
char *name = i < 8 ? (char *)names[i] : char *allocated_name = NULL;
g_strdup_printf ("cogl_tex_coord%d_in", i); const char *name;
if (i < 8)
name = names[i];
else
name = allocated_name = g_strdup_printf ("cogl_tex_coord%d_in", i);
attributes[i + 1] = cogl_attribute_new (attribute_buffer, attributes[i + 1] = cogl_attribute_new (attribute_buffer,
name, name,
@ -1106,6 +1111,8 @@ cogl_polygon (const CoglTextureVertex *vertices,
12 + 8 * i, 12 + 8 * i,
2, 2,
COGL_ATTRIBUTE_TYPE_FLOAT); COGL_ATTRIBUTE_TYPE_FLOAT);
g_free (allocated_name);
} }
if (use_color) if (use_color)
@ -1170,5 +1177,9 @@ cogl_polygon (const CoglTextureVertex *vertices,
if (pipeline != validate_state.original_pipeline) if (pipeline != validate_state.original_pipeline)
cogl_object_unref (pipeline); cogl_object_unref (pipeline);
}
cogl_object_unref (attribute_buffer);
for (i = 0; i < n_attributes; i++)
cogl_object_unref (attributes[i]);
}