diff --git a/ChangeLog b/ChangeLog
index dfbb70f11..97565422c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-24  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cffdrivr.c (cff_get_glyph_name): Protect agains zero
+	glyph name pointer.  Reported by Mikey Anbary <manbary@vizrt.com>.
+
 2003-06-23  Werner Lemberg  <wl@gnu.org>
 
 	* src/tools/glnames.py: Updated to AGL 2.0.
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 3bcee6286..1738840d9 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -255,7 +255,7 @@
     /* now, lookup the name itself */
     gname = cff_index_get_sid_string( &font->string_index, sid, psnames );
 
-    if ( buffer_max > 0 )
+    if ( gname && buffer_max > 0 )
     {
       FT_UInt  len = (FT_UInt)ft_strlen( gname );