diff --git a/ChangeLog b/ChangeLog
index 189ac7b49..d8a4917b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-25  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cffdrivr.c (cff_get_name_index): Make last patch work
+	actually.
+
 2002-01-25  Martin Zinser  <zinser@decus.de>
 
 	* src/cache/ftccache.c (ftc_node_done, ftc_node_destroy): Fix
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 6f8437920..6b89b2af1 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -228,7 +228,7 @@
                       FT_UInt     buffer_max )
   {
     CFF_Font*           font   = (CFF_Font*)face->extra.data;
-    FT_Memory           memory = FT_FACE_MEMORY(face);
+    FT_Memory           memory = FT_FACE_MEMORY( face );
     FT_String*          gname;
     FT_UShort           sid;
     PSNames_Interface*  psnames;
@@ -341,6 +341,7 @@
     CFF_Font*           cff;
     CFF_Charset*        charset;
     PSNames_Interface*  psnames;
+    FT_Memory           memory = FT_FACE_MEMORY( face );
     FT_String*          name;
     FT_UShort           sid;
     FT_UInt             i;
@@ -367,7 +368,7 @@
       if ( sid > 390 )
         FREE( name );
 
-      if ( !ret )
+      if ( !result )
         return i;
     }