Commit 19b82cfbed2a269b0aae92f6dff3d40c3adccd3d

Werner Lemberg 2015-09-11T20:25:32

[base] Avoid crash while tracing `load_mac_face'. Reported in Savannah bug #45919. * src/base/ftobjs.c (load_mac_face): Honour FT_OPEN_MEMORY while tracing.

diff --git a/ChangeLog b/ChangeLog
index 804a7b8..1241306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2015-09-11  Werner Lemberg  <wl@gnu.org>
 
+	[base] Avoid crash while tracing `load_mac_face'.
+
+	Reported in Savannah bug #45919.
+
+	* src/base/ftobjs.c (load_mac_face): Honour FT_OPEN_MEMORY while
+	tracing.
+
+2015-09-11  Werner Lemberg  <wl@gnu.org>
+
 	[type42] Fix endless loop (#45920).
 
 	* src/type42/t42parse.c (t42_parse_encoding): Synchronize with
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 7092856..3a41ac0 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2037,7 +2037,11 @@
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_raccess
 
-      FT_TRACE3(( "Try as dfont: %s ...", args->pathname ));
+#ifdef FT_DEBUG_LEVEL_TRACE
+      FT_TRACE3(( "Try as dfont: " ));
+      if ( !( args->flags & FT_OPEN_MEMORY ) )
+        FT_TRACE3(( "%s ...", args->pathname ));
+#endif
 
       error = IsMacResource( library, stream, 0, face_index, aface );