diff --git a/ChangeLog b/ChangeLog
index ad7a08092..53c994ccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-20  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* src/base/ftmac.c (FT_New_Face_From_Suitcase): Check if valid
+	aface is returned by FT_New_Face_From_FOND(). The patch was
+	proposed by anonymous reporter of Savannah bug #23204.
+
 2008-05-18  Werner Lemberg  <wl@gnu.org>
 
 	* src/pshinter/pshalgo.c (ps_hints_apply): Reset scale values after
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index 5b265905a..7f059076d 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -899,7 +899,7 @@ typedef short ResourceIndex;
     }
 
     CloseResFile( res_ref );
-    if ( FT_Err_Ok == error && NULL != aface )
+    if ( FT_Err_Ok == error && NULL != aface && NULL != *aface )
       (*aface)->num_faces = num_faces_in_res;
     return error;
   }