From 19b82cfbed2a269b0aae92f6dff3d40c3adccd3d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 11 Sep 2015 20:25:32 +0200 Subject: [PATCH] [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. --- ChangeLog | 9 +++++++++ src/base/ftobjs.c | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 804a7b8d6..12413063b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-09-11 Werner Lemberg + + [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 [type42] Fix endless loop (#45920). diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 70928561e..3a41ac00a 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 );