pango r2797 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Thu Jan  8 07:34:49 2009
New Revision: 2797
URL: http://svn.gnome.org/viewvc/pango?rev=2797&view=rev

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

        * pango/pangofc-fontmap.c (pango_fc_font_map_get_patterns):
        Protect against a NULL context.

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	Thu Jan  8 07:34:49 2009
@@ -1055,7 +1055,7 @@
   key.desc = pango_font_description_copy_static (desc);
   pango_font_description_unset_fields (key.desc, PANGO_FONT_MASK_SIZE);
 
-  if (PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get)
+  if (context && PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get)
     key.context_key = (gpointer)PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get (fcfontmap, context);
   else
     key.context_key = NULL;