diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-07-20 16:31:33 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-07-20 16:58:28 -0400 |
| commit | fe07285144de9146822bce5667aadcf1bc0d4111 (patch) | |
| tree | 5a90c2d6cc6be7eeaf4ece8574f521d06ca150f4 | |
| parent | efd34a719271d3c386d5fd4d852619829355fc88 (diff) | |
| download | pango-fe07285144de9146822bce5667aadcf1bc0d4111.tar.gz | |
Bug 585806 – crash during pango_fc_font_map_shutdown
| -rw-r--r-- | pango/pangofc-font.c | 3 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 509d0987..1b210cd5 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -777,9 +777,6 @@ _pango_fc_font_shutdown (PangoFcFont *font) if (PANGO_FC_FONT_GET_CLASS (font)->shutdown) PANGO_FC_FONT_GET_CLASS (font)->shutdown (font); - - if (font->fontmap) - _pango_fc_font_map_remove (PANGO_FC_FONT_MAP (font->fontmap), font); } /** diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 4f7c8dba..adbafaa4 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1974,7 +1974,6 @@ pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap) return pango_font_map_create_context (PANGO_FONT_MAP (fcfontmap)); } -/* Closely related to _pango_fc_font_map_remove() */ static void shutdown_font (gpointer key, PangoFcFont *fcfont, @@ -1982,10 +1981,6 @@ shutdown_font (gpointer key, { _pango_fc_font_shutdown (fcfont); - /* While _pango_fc_font_shutdown() tries to call - * _pango_fc_font_map_remove(), it's too late as the fontmap - * weakref has already NULL'ed fcfont->fontmap, so we cleanup - * ourselves. */ _pango_fc_font_set_font_key (fcfont, NULL); pango_fc_font_key_free (key); } |