diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2008-08-22 07:01:35 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-08-22 07:01:35 +0000 |
| commit | d8b4b188b676b9cdb3f33a599fc2a77051c6938c (patch) | |
| tree | 2de7ef235a30da00f5025d1a4c3d2e12966f0c37 /pango/pangoatsui.c | |
| parent | 10405497c1479fd0366458c76e5036ae5e947abb (diff) | |
| download | pango-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/pangoatsui.c')
| -rw-r--r-- | pango/pangoatsui.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pango/pangoatsui.c b/pango/pangoatsui.c index 58a4569a..a8c026e6 100644 --- a/pango/pangoatsui.c +++ b/pango/pangoatsui.c @@ -45,7 +45,9 @@ pango_atsui_font_finalize (GObject *object) pango_font_description_free (priv->desc); - g_object_unref (priv->fontmap); + g_assert (priv->fontmap != NULL); + g_object_remove_weak_pointer (G_OBJECT (priv->fontmap), (gpointer *) (gpointer) &priv->fontmap); + priv->fontmap = NULL; G_OBJECT_CLASS (pango_atsui_font_parent_class)->finalize (object); } @@ -135,8 +137,8 @@ _pango_atsui_font_set_font_map (PangoATSUIFont *font, PangoATSUIFontPrivate *priv = font->priv; g_assert (priv->fontmap == NULL); - - priv->fontmap = g_object_ref (fontmap); + priv->fontmap = (PangoFontMap *) fontmap; + g_object_add_weak_pointer (G_OBJECT (prev->fontmap), (gpointer *) (gpointer) &priv->fontmap); } void |