fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-17 20:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cairo-ft-font] Destroy the path on error.

Browse source 
During _decompose_glyph_outline() destroy the fixed path if we
encounter an error.
This commit is contained in:
Chris Wilson 2007-05-12 14:36:11 +01:00
parent abb19e61cf
commit fcd1076bcf
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cairo-ft-font.c
View file

@ -1751,7 +1751,7 @@ _decompose_glyph_outline (FT_Face face,
FT_GlyphSlot glyph;
cairo_path_fixed_t *path;
cairo_status_t status, status2;
cairo_status_t status;
path = _cairo_path_fixed_create ();
if (!path)
@ -1759,20 +1759,22 @@ _decompose_glyph_outline (FT_Face face,
glyph = face->glyph;
status = CAIRO_STATUS_SUCCESS;
/* Font glyphs have an inverted Y axis compared to cairo. */
FT_Outline_Transform (&glyph->outline, &invert_y);
if (FT_Outline_Decompose (&glyph->outline, &outline_funcs, path))
status = CAIRO_STATUS_NO_MEMORY;
if (FT_Outline_Decompose (&glyph->outline, &outline_funcs, path)) {
_cairo_path_fixed_destroy (path);
return CAIRO_STATUS_NO_MEMORY;
}
status2 = _cairo_path_fixed_close_path (path);
if (status == CAIRO_STATUS_SUCCESS)
status = status2;
status = _cairo_path_fixed_close_path (path);
if (status) {
_cairo_path_fixed_destroy (path);
return status;
}
if (status == CAIRO_STATUS_SUCCESS)
*pathp = path;
*pathp = path;
return status;
return CAIRO_STATUS_SUCCESS;
}
/*