fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-01 15:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-user-font-leaks' into 'master'

Browse source 
user-font: Plug some memory leaks

See merge request cairo/cairo!271
This commit is contained in:
Emmanuele Bassi 2022-02-11 11:59:03 +00:00
commit cd21fa0814
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cairo-user-font.c
View file

@ -187,10 +187,13 @@ _cairo_user_scaled_glyph_init (void *abstract_font,
status = cairo_status (cr);
scaled_glyph->recording_is_color = TRUE;
}
cairo_destroy (cr);
}
if (status == (cairo_int_status_t)CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED &&
face->scaled_font_methods.render_glyph) {
if (recording_surface)
cairo_surface_destroy (recording_surface);
recording_surface = _cairo_user_scaled_font_create_recording_surface (scaled_font, FALSE);
cr = _cairo_user_scaled_font_create_recording_context (scaled_font, recording_surface, FALSE);
@ -309,6 +312,7 @@ _cairo_user_scaled_glyph_init (void *abstract_font,
_cairo_scaled_glyph_set_surface (scaled_glyph,
&scaled_font->base,
(cairo_image_surface_t *) surface);
surface = NULL;
}
if (scaled_glyph->recording_is_color && (info & CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE)) {
@ -316,7 +320,11 @@ _cairo_user_scaled_glyph_init (void *abstract_font,
&scaled_font->base,
(cairo_image_surface_t *)surface,
FALSE);
surface = NULL;
}
if (surface)
cairo_surface_destroy (surface);
}
if (info & CAIRO_SCALED_GLYPH_INFO_PATH) {