From 8eb8470fde676c147a76e406e1fb2c66a00d016b Mon Sep 17 00:00:00 2001 From: Alex Larsson Date: Tue, 27 Nov 2001 00:11:35 +0000 Subject: Don't leak filename copy. Don't leak matched pattern 2001-11-26 Alex Larsson * pango/pangoxft-font.c (pango_xft_font_get_coverage): Don't leak filename copy. * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): Don't leak matched pattern --- ChangeLog | 8 ++++++++ ChangeLog.pre-1-0 | 8 ++++++++ ChangeLog.pre-1-10 | 8 ++++++++ ChangeLog.pre-1-2 | 8 ++++++++ ChangeLog.pre-1-4 | 8 ++++++++ ChangeLog.pre-1-6 | 8 ++++++++ ChangeLog.pre-1-8 | 8 ++++++++ pango/pangoxft-font.c | 2 +- pango/pangoxft-fontmap.c | 11 ++++++++--- 9 files changed, 65 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c689b5e5..95b62de8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-11-26 Alex Larsson + + * pango/pangoxft-font.c (pango_xft_font_get_coverage): + Don't leak filename copy. + + * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): + Don't leak matched pattern + Mon Nov 26 18:17:00 2001 Owen Taylor * tests/Makefile.am tests/gen-all-unicode.c: Instead diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index c689b5e5..95b62de8 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,11 @@ +2001-11-26 Alex Larsson + + * pango/pangoxft-font.c (pango_xft_font_get_coverage): + Don't leak filename copy. + + * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): + Don't leak matched pattern + Mon Nov 26 18:17:00 2001 Owen Taylor * tests/Makefile.am tests/gen-all-unicode.c: Instead diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c689b5e5..95b62de8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +2001-11-26 Alex Larsson + + * pango/pangoxft-font.c (pango_xft_font_get_coverage): + Don't leak filename copy. + + * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): + Don't leak matched pattern + Mon Nov 26 18:17:00 2001 Owen Taylor * tests/Makefile.am tests/gen-all-unicode.c: Instead diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index c689b5e5..95b62de8 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,11 @@ +2001-11-26 Alex Larsson + + * pango/pangoxft-font.c (pango_xft_font_get_coverage): + Don't leak filename copy. + + * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): + Don't leak matched pattern + Mon Nov 26 18:17:00 2001 Owen Taylor * tests/Makefile.am tests/gen-all-unicode.c: Instead diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index c689b5e5..95b62de8 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +2001-11-26 Alex Larsson + + * pango/pangoxft-font.c (pango_xft_font_get_coverage): + Don't leak filename copy. + + * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): + Don't leak matched pattern + Mon Nov 26 18:17:00 2001 Owen Taylor * tests/Makefile.am tests/gen-all-unicode.c: Instead diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c689b5e5..95b62de8 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +2001-11-26 Alex Larsson + + * pango/pangoxft-font.c (pango_xft_font_get_coverage): + Don't leak filename copy. + + * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): + Don't leak matched pattern + Mon Nov 26 18:17:00 2001 Owen Taylor * tests/Makefile.am tests/gen-all-unicode.c: Instead diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c689b5e5..95b62de8 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +2001-11-26 Alex Larsson + + * pango/pangoxft-font.c (pango_xft_font_get_coverage): + Don't leak filename copy. + + * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): + Don't leak matched pattern + Mon Nov 26 18:17:00 2001 Owen Taylor * tests/Makefile.am tests/gen-all-unicode.c: Instead diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 9a71487b..a5355dc5 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -478,7 +478,7 @@ pango_xft_font_get_coverage (PangoFont *font, pango_coverage_set (coverage, i, PANGO_COVERAGE_EXACT); } - _pango_xft_font_map_set_coverage (xfont->fontmap, g_strdup (filename), coverage); + _pango_xft_font_map_set_coverage (xfont->fontmap, filename, coverage); return coverage; } diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index 3ca383b5..eef3ce77 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -516,16 +516,21 @@ pango_xft_font_map_load_font (PangoFontMap *fontmap, PangoXftFontMap *xfontmap = (PangoXftFontMap *)fontmap; XftPattern *pattern, *match; XftResult res; + PangoFont *font = NULL; pattern = pango_xft_make_pattern (description); match = XftFontMatch (xfontmap->display, xfontmap->screen, pattern, &res); + XftPatternDestroy (pattern); if (match) - return pango_xft_font_map_new_font (fontmap, match); - - return NULL; + { + font = pango_xft_font_map_new_font (fontmap, match); + XftPatternDestroy (match); + } + + return font; } -- cgit v1.2.1