pango r2802 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Wed Jan 28 22:07:21 2009
New Revision: 2802
URL: http://svn.gnome.org/viewvc/pango?rev=2802&view=rev

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

        * pango/pangofc-fontmap.c (font_hash_key_equal):
        Avoid context key comparison if any of the keys is NULL.

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	Wed Jan 28 22:07:21 2009
@@ -388,12 +388,12 @@
       key_a->matrix.yy == key_b->matrix.yy &&
       key_a->pattern == key_b->pattern)
     {
-      if (key_a->context_key)
+      if (key_a->context_key && key_b->context_key)
 	return PANGO_FC_FONT_MAP_GET_CLASS (key_a->fontmap)->context_key_equal (key_a->fontmap,
 										key_a->context_key,
 										key_b->context_key);
       else
-	return TRUE;
+        return key_a->context_key == key_b->context_key;
     }
   else
     return FALSE;