Bug 585806 – crash during pango_fc_font_map_shutdown

diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 509d098..1b210cd 100644 (file)
--- 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 4f7c8db..adbafaa 100644 (file)
--- 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);
 }