kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index 146d971..70c1c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-07  Tom Parker  <palfrey@tevp.net>
+
+	* src/cff/cffdrivr.c (cff_get_name_index): Protect against NULL
+	pointer.
+
 2007-02-05  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* include/freetype/ftmac.h (FT_DEPRECATED_ATTRIBUTE):
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 1f04728..8b67ce2 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -270,6 +270,9 @@
       else
         name = (FT_String *)psnames->adobe_std_strings( sid );
 
+      if ( !name )
+        continue;
+
       result = ft_strcmp( glyph_name, name );
 
       if ( sid > 390 )