bug 1412947: crash with some (non-truetype?) fonts

diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp
index d2b19d0f2255c6ec07cf6c9254c7c48b5cd381bf..190bbb19fa8822bccdbceda4fa76a6e7fb93eb3e 100644 (file)
--- a/src/libnrtype/FontInstance.cpp
+++ b/src/libnrtype/FontInstance.cpp
@@ -349,7 +349,8 @@ void font_instance::InitTheFace()
     SelectObject(daddy->hScreenDC,theFace);
 #else
        theFace=pango_ft2_font_get_face(pFont);
-       FT_Select_Charmap(theFace,ft_encoding_unicode) && FT_Select_Charmap(theFace,ft_encoding_symbol);
+    if ( theFace )
+        FT_Select_Charmap(theFace,ft_encoding_unicode) && FT_Select_Charmap(theFace,ft_encoding_symbol);
 #endif
 }