AuroraMiddleware/freetype
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[sfnt] Fix memory leaks in previous patch.

Browse Source
This commit is contained in:
suzuki toshiya 2010-01-30 02:24:25 +09:00
parent 75852eda51
commit c9669a8a63
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2010-01-29 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Fix memory leaks in previous patch.
* src/sfnt/sfobjs.c (sfnt_load_face): Don't overwrite the strings
allocated for face->root.family_name and style_name.
2010-01-29 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
New parameters for FT_Open_Face() to ignore preferred family names.

20
src/sfnt/sfobjs.c
View File

@ -737,29 +737,33 @@
/* Foundation (WPF). This flag has been introduced in version */
/* 1.5 of the OpenType specification (May 2008). */
face->root.family_name = NULL;
face->root.style_name = NULL;
if ( face->os2.version != 0xFFFFU && face->os2.fsSelection & 256 )
{
GET_NAME( FONT_FAMILY, &face->root.family_name );
if ( !face->root.family_name || !ignore_preferred_family )
if ( !ignore_preferred_family )
GET_NAME( PREFERRED_FAMILY, &face->root.family_name );
if ( !face->root.family_name )
GET_NAME( FONT_FAMILY, &face->root.family_name );
GET_NAME( FONT_SUBFAMILY, &face->root.style_name );
if ( !face->root.style_name || !ignore_preferred_subfamily )
if ( !ignore_preferred_subfamily )
GET_NAME( PREFERRED_SUBFAMILY, &face->root.style_name );
if ( !face->root.style_name )
GET_NAME( FONT_SUBFAMILY, &face->root.style_name );
}
else
{
GET_NAME( WWS_FAMILY, &face->root.family_name );
if ( !face->root.family_name && !ignore_preferred_family )
GET_NAME( PREFERRED_FAMILY, &face->root.family_name );
if ( !face->root.family_name )
GET_NAME( FONT_FAMILY, &face->root.family_name );
if ( !face->root.family_name || !ignore_preferred_family )
GET_NAME( PREFERRED_FAMILY, &face->root.family_name );
GET_NAME( WWS_SUBFAMILY, &face->root.style_name );
if ( !face->root.style_name && !ignore_preferred_subfamily )
GET_NAME( PREFERRED_SUBFAMILY, &face->root.style_name );
if ( !face->root.style_name )
GET_NAME( FONT_SUBFAMILY, &face->root.style_name );
if ( !face->root.style_name || !ignore_preferred_subfamily )
GET_NAME( PREFERRED_SUBFAMILY, &face->root.style_name );
}
/* now set up root fields */