minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[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.
This commit is contained in:
Werner Lemberg 2015-09-11 20:25:32 +02:00
parent 23423bc6f9
commit 19b82cfbed
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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).

6
src/base/ftobjs.c
View File

@ -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 );