File Edit Options Buffers Tools Help

Thu Jul 25 11:42:17 2002  Owen Taylor  <otaylor@redhat.com>

        * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display)
        * pango/pangowin32-fontmap.c (pango_win32_shutdown_display):
        Handle checking for fontmap == NULL and setting
        it to NULL after unrefing properly. (#87915,
        Sven Neumann)

8 files changed, 63 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 86dcff8e..c5211ebf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 25 11:42:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c (pango_ft2_shutdown_display)
+	* pango/pangowin32-fontmap.c (pango_win32_shutdown_display):
+	Handle checking for fontmap == NULL and setting
+	it to NULL after unrefing properly. (#87915, 
+	Sven Neumann)
+
 Wed Jul 24 23:07:43 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/pango-layout.c: Fix wrong assertion that was
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 86dcff8e..c5211ebf 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Thu Jul 25 11:42:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c (pango_ft2_shutdown_display)
+	* pango/pangowin32-fontmap.c (pango_win32_shutdown_display):
+	Handle checking for fontmap == NULL and setting
+	it to NULL after unrefing properly. (#87915, 
+	Sven Neumann)
+
 Wed Jul 24 23:07:43 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/pango-layout.c: Fix wrong assertion that was
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 86dcff8e..c5211ebf 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+Thu Jul 25 11:42:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c (pango_ft2_shutdown_display)
+	* pango/pangowin32-fontmap.c (pango_win32_shutdown_display):
+	Handle checking for fontmap == NULL and setting
+	it to NULL after unrefing properly. (#87915, 
+	Sven Neumann)
+
 Wed Jul 24 23:07:43 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/pango-layout.c: Fix wrong assertion that was
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 86dcff8e..c5211ebf 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Thu Jul 25 11:42:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c (pango_ft2_shutdown_display)
+	* pango/pangowin32-fontmap.c (pango_win32_shutdown_display):
+	Handle checking for fontmap == NULL and setting
+	it to NULL after unrefing properly. (#87915, 
+	Sven Neumann)
+
 Wed Jul 24 23:07:43 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/pango-layout.c: Fix wrong assertion that was
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 86dcff8e..c5211ebf 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Thu Jul 25 11:42:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c (pango_ft2_shutdown_display)
+	* pango/pangowin32-fontmap.c (pango_win32_shutdown_display):
+	Handle checking for fontmap == NULL and setting
+	it to NULL after unrefing properly. (#87915, 
+	Sven Neumann)
+
 Wed Jul 24 23:07:43 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/pango-layout.c: Fix wrong assertion that was
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 86dcff8e..c5211ebf 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Thu Jul 25 11:42:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c (pango_ft2_shutdown_display)
+	* pango/pangowin32-fontmap.c (pango_win32_shutdown_display):
+	Handle checking for fontmap == NULL and setting
+	it to NULL after unrefing properly. (#87915, 
+	Sven Neumann)
+
 Wed Jul 24 23:07:43 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/pango-layout.c: Fix wrong assertion that was
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 87ddbf9e..88effe78 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -325,11 +325,14 @@ pango_ft2_font_map_for_display (void)
 void
 pango_ft2_shutdown_display (void)
 {
-  pango_ft2_font_map_cache_clear (pango_ft2_global_fontmap);
-
-  g_object_unref (G_OBJECT (pango_ft2_global_fontmap));
-
-  pango_ft2_global_fontmap = NULL;
+  if (pango_ft2_global_fontmap)
+    {
+      pango_ft2_font_map_cache_clear (pango_ft2_global_fontmap);
+      
+      g_object_unref (G_OBJECT (pango_ft2_global_fontmap));
+      
+      pango_ft2_global_fontmap = NULL;
+    }
 }
 
 
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 01227d04..45b8e68f 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -277,8 +277,13 @@ pango_win32_font_map_for_display (void)
 void
 pango_win32_shutdown_display (void)
 {
-  pango_win32_fontmap_cache_clear (fontmap);
-  g_object_unref (G_OBJECT (fontmap));
+  if (fontmap)
+    {
+      pango_win32_fontmap_cache_clear (fontmap);
+      g_object_unref (G_OBJECT (fontmap));
+
+      fontmap = NULL;
+    }
 }
 
 static void