From 8dfecde0bdff41381e65b077420692645887c440 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 22 Jul 2011 11:22:07 +0200
Subject: Patch from Andreas Becker to fix bug 805238 (Crash when setting empty
 font family)

(bzr r10487)
---
 src/libnrtype/FontFactory.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/libnrtype')

diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index 7fc0a9715..e6d22e070 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -404,7 +404,10 @@ Glib::ustring font_factory::GetUIFamilyString(PangoFontDescription const *fontDe
 
     if (fontDescr) {
         // For now, keep it as family name taken from pango
-        family = pango_font_description_get_family(fontDescr);
+        const char *pangoFamily = pango_font_description_get_family(fontDescr);
+        if( pangoFamily ) {
+            family = pangoFamily;
+        }
     }
 
     return family;
-- 
cgit v1.2.3