isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st-private: Correct fix for memory leak

Browse Source 
The previous fix in 72f9f482d was wrong; we need to keep around
the buffer until cairo is done with the pattern.

https://bugzilla.gnome.org/show_bug.cgi?id=649497
This commit is contained in:
Colin Walters 2011-05-11 11:21:18 -04:00
parent 941246a4f0
commit ba5c45deaf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/st/st-private.c
View File

@ -667,6 +667,7 @@ cairo_pattern_t *
_st_create_shadow_cairo_pattern (StShadow *shadow_spec, _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
cairo_pattern_t *src_pattern) cairo_pattern_t *src_pattern)
{ {
static cairo_user_data_key_t shadow_pattern_user_data;
cairo_t *cr; cairo_t *cr;
cairo_surface_t *src_surface; cairo_surface_t *src_surface;
cairo_surface_t *surface_in; cairo_surface_t *surface_in;
@ -728,6 +729,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
width_out, width_out,
height_out, height_out,
rowstride_out); rowstride_out);
cairo_surface_set_user_data (surface_out, &shadow_pattern_user_data,
pixels_out, (cairo_destroy_func_t) g_free);
dst_pattern = cairo_pattern_create_for_surface (surface_out); dst_pattern = cairo_pattern_create_for_surface (surface_out);
cairo_surface_destroy (surface_out); cairo_surface_destroy (surface_out);
@ -745,8 +748,7 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
(width_out - width_in) / 2.0, (width_out - width_in) / 2.0,
(height_out - height_in) / 2.0); (height_out - height_in) / 2.0);
cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
return dst_pattern;
goto out;
} }
/* Read all the code from the cairo_pattern_set_matrix call /* Read all the code from the cairo_pattern_set_matrix call
@ -784,8 +786,6 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
out:
g_free (pixels_out);
return dst_pattern; return dst_pattern;
} }