shithub: freetype+ttf2subf

Download patch

ref: 19b82cfbed2a269b0aae92f6dff3d40c3adccd3d
parent: 23423bc6f998fe715306cfc52a436b3f24824f02
author: Werner Lemberg <[email protected]>
date: Fri Sep 11 16:25:32 EDT 2015

[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.

git/fs: mount .git/fs: mount/attach disallowed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2015-09-11  Werner Lemberg  <[email protected]>
 
+	[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  <[email protected]>
+
 	[type42] Fix endless loop (#45920).
 
 	* src/type42/t42parse.c (t42_parse_encoding): Synchronize with
--- 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 );