From 8f47453b6a466d32de347de527b350129975b4cc Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 7 Feb 2007 08:31:01 +0000
Subject: [PATCH] * src/cff/cffdrivr.c (cff_get_name_index): Protect against
 NULL pointer.

---
 ChangeLog          | 5 +++++
 src/cff/cffdrivr.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 146d97186..70c1c8869 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 1f04728ea..8b67ce2bc 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 )