fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-09 07:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cairo-gstate] Fix resource leaks on error paths.

Browse source 
Ensure that all locally allocated (or referenced) resources are freed
if we later encounter an error.
This commit is contained in:
Chris Wilson 2007-10-04 16:03:12 +01:00
parent 4e44d54f3e
commit 261971a3fb
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cairo-gstate.c
View file

@ -93,8 +93,13 @@ _cairo_gstate_init (cairo_gstate_t *gstate,
gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK,
CAIRO_CONTENT_COLOR);
if (gstate->source->status)
if (gstate->source->status) {
cairo_surface_destroy (gstate->target);
gstate->target = NULL;
cairo_surface_destroy (gstate->original_target);
gstate->original_target = NULL;
return gstate->source->status;
}
return target ? target->status : CAIRO_STATUS_NULL_POINTER;
}
@ -131,8 +136,12 @@ _cairo_gstate_init_copy (cairo_gstate_t *gstate, cairo_gstate_t *other)
_cairo_font_options_init_copy (&gstate->font_options , &other->font_options);
status = _cairo_clip_init_copy (&gstate->clip, &other->clip);
if (status)
if (status) {
_cairo_stroke_style_fini (&gstate->stroke_style);
cairo_font_face_destroy (gstate->font_face);
cairo_scaled_font_destroy (gstate->scaled_font);
return status;
}
gstate->target = cairo_surface_reference (other->target);
/* parent_target is always set to NULL; it's only ever set by redirect_target */
@ -994,7 +1003,7 @@ _cairo_gstate_in_stroke (cairo_gstate_t *gstate,
double y,
cairo_bool_t *inside_ret)
{
cairo_status_t status = CAIRO_STATUS_SUCCESS;
cairo_status_t status;
cairo_traps_t traps;
if (gstate->stroke_style.line_width <= 0.0) {
@ -1060,7 +1069,7 @@ _cairo_gstate_in_fill (cairo_gstate_t *gstate,
double y,
cairo_bool_t *inside_ret)
{
cairo_status_t status = CAIRO_STATUS_SUCCESS;
cairo_status_t status;
cairo_traps_t traps;
_cairo_gstate_user_to_backend (gstate, &x, &y);
@ -1267,11 +1276,9 @@ _cairo_gstate_select_font_face (cairo_gstate_t *gstate,
return font_face->status;
status = _cairo_gstate_set_font_face (gstate, font_face);
if (status)
return status;
cairo_font_face_destroy (font_face);
return CAIRO_STATUS_SUCCESS;
return status;
}
cairo_status_t
@ -1558,7 +1565,6 @@ _cairo_gstate_show_glyphs (cairo_gstate_t *gstate,
cairo_glyph_t *transformed_glyphs;
cairo_glyph_t stack_transformed_glyphs[STACK_GLYPHS_LEN];
if (gstate->source->status)
return gstate->source->status;