commit 86c0f904983b9cffe45636de8263cafe97cf9bce
author Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> Tue Nov 20 14:00:17 2007 +0000
committer Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> Tue Nov 20 14:00:17 2007 +0000
tree bf50ccc0eadb76b492d3b42ca21e7ca0745c1ab1
parent a547068835251234af723b1a5d78a0b629605f5d

* src/base/{ftobjs.c, ftrfork.c}: recovery of Carbon-free legacy MacOS font support in freetype-2.3.4

src/base/ftrfork.c

diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index a4f726d..120c2f8 100644
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -339,7 +339,11 @@
     for ( i = 0; i < FT_RACCESS_N_RULES; i++ )
     {
       new_names[i] = NULL;
-      errors[i] = FT_Stream_Seek( stream, 0 );
+      if ( NULL != stream )
+        errors[i] = FT_Stream_Seek( stream, 0 );
+      else
+        errors[i] = FT_Err_Ok;
+
       if ( errors[i] )
         continue ;
 
@@ -362,6 +366,9 @@
 
 
     *result_file_name = NULL;
+    if ( NULL == stream )
+      return FT_Err_Cannot_Open_Stream;
+
     return raccess_guess_apple_generic( library, stream, base_file_name,
                                         magic, result_offset );
   }
@@ -378,6 +385,9 @@
 
 
     *result_file_name = NULL;
+    if ( NULL == stream )
+      return FT_Err_Cannot_Open_Stream;
+
     return raccess_guess_apple_generic( library, stream, base_file_name,
                                         magic, result_offset );
   }