pango r2821 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Fri Jan 30 05:04:47 2009
New Revision: 2821
URL: http://svn.gnome.org/viewvc/pango?rev=2821&view=rev

Log:
2009-01-30  Behdad Esfahbod  <behdad gnome org>

        Bug 569763 â pango doesn't like font descriptions without family!

        * pango/pangofc-fontmap.c (pango_fc_make_pattern): Don't crash is desc
        doesn't have family set.

Modified:
   trunk/ChangeLog
   trunk/pango/pangofc-fontmap.c

Modified: trunk/pango/pangofc-fontmap.c
==============================================================================
--- trunk/pango/pangofc-fontmap.c	(original)
+++ trunk/pango/pangofc-fontmap.c	Fri Jan 30 05:04:47 2009
@@ -1353,13 +1353,15 @@
 			    FC_PIXEL_SIZE,  FcTypeDouble,  pixel_size / 1024.,
 			    NULL);
 
-  g_message ("'%s'", pango_font_description_get_family (description));
-  families = g_strsplit (pango_font_description_get_family (description), ",", -1);
+  if (pango_font_description_get_family (description))
+    {
+      families = g_strsplit (pango_font_description_get_family (description), ",", -1);
 
-  for (i = 0; families[i]; i++)
-    FcPatternAddString (pattern, FC_FAMILY, (FcChar8*) families[i]);
+      for (i = 0; families[i]; i++)
+	FcPatternAddString (pattern, FC_FAMILY, (FcChar8*) families[i]);
 
-  g_strfreev (families);
+      g_strfreev (families);
+    }
 
   if (language)
     FcPatternAddString (pattern, FC_LANG, (FcChar8 *) pango_language_to_string (language));