summaryrefslogtreecommitdiff
path: root/pango/pangofc-font.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-08-22 07:01:35 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-08-22 07:01:35 +0000
commitd8b4b188b676b9cdb3f33a599fc2a77051c6938c (patch)
tree2de7ef235a30da00f5025d1a4c3d2e12966f0c37 /pango/pangofc-font.c
parent10405497c1479fd0366458c76e5036ae5e947abb (diff)
downloadpango-d8b4b188b676b9cdb3f33a599fc2a77051c6938c.tar.gz
Bug 143542 – PangoFT2Fontmap leak
2008-08-22 Behdad Esfahbod <behdad@gnome.org> Bug 143542 – PangoFT2Fontmap leak * pango/fonts.c: * pango/pangoatsui.c (pango_atsui_font_finalize), (_pango_atsui_font_set_font_map): * pango/pangocairo-font.c (_pango_cairo_font_get_metrics), (_pango_cairo_font_private_get_hex_box_info): * pango/pangocairo-win32font.c (_pango_cairo_win32_font_new): * pango/pangofc-font.c (pango_fc_font_get_metrics): * pango/pangofc-fontmap.c (pango_fc_font_map_add), (_pango_fc_font_map_remove), (cleanup_font): * pango/pangowin32-fontmap.c (pango_win32_font_neww), (pango_win32_font_map_real_find_font): * pango/pangowin32.c (pango_win32_font_finalize): * pango/pangox-fontmap.c (pango_x_font_map_load_font): * pango/pangox.c (pango_x_font_new), (pango_x_font_finalize): Make the reference the font->fontmap reference weak. The code for setting the reference must look like this: g_assert (font->fontmap == NULL); font->fontmap = (PangoFontMap *) fontmap; g_object_add_weak_pointer (G_OBJECT (font->fontmap), (gpointer *) (gpointer) &font->fontmap); And releasing it like: g_assert (font->fontmap != NULL); g_object_remove_weak_pointer (G_OBJECT (font->fontmap), (gpointer *) (gpointer) &font->fontmap); font->fontmap = NULL; I have converted all fontmaps. The win32 and atsui ones can use some simple testing. The PangoFc fonts actually don't need the weakref as the fontmap already provides a similar link by itself. svn path=/trunk/; revision=2704
Diffstat (limited to 'pango/pangofc-font.c')
-rw-r--r--pango/pangofc-font.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 8bd23e2b..9acd75d6 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -529,10 +529,14 @@ pango_fc_font_get_metrics (PangoFont *font,
if (!tmp_list)
{
+ PangoFontMap *fontmap;
PangoContext *context;
- if (!fcfont->fontmap)
+ /* XXX this is racy. because weakref's are racy... */
+ fontmap = fcfont->fontmap;
+ if (!fontmap)
return pango_font_metrics_new ();
+ fontmap = g_object_ref (fontmap);
info = g_slice_new0 (PangoFcMetricsInfo);
@@ -541,12 +545,13 @@ pango_fc_font_get_metrics (PangoFont *font,
info->sample_str = sample_str;
- context = pango_font_map_create_context (fcfont->fontmap);
+ context = pango_font_map_create_context (fontmap);
pango_context_set_language (context, language);
info->metrics = pango_fc_font_create_metrics_for_context (fcfont, context);
g_object_unref (context);
+ g_object_unref (fontmap);
}
return pango_font_metrics_ref (info->metrics);