From fe07285144de9146822bce5667aadcf1bc0d4111 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 20 Jul 2009 16:31:33 -0400 Subject: =?UTF-8?q?Bug=20585806=20=E2=80=93=20crash=20during=20pango=5Ffc?= =?UTF-8?q?=5Ffont=5Fmap=5Fshutdown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pango/pangofc-font.c | 3 --- pango/pangofc-fontmap.c | 5 ----- 2 files changed, 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); } -- cgit v1.2.1