rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[type1, type42] Fix memory leaks (#45966). 

* src/type1/t1load.c (parse_blend_axis_types): Handle multiple axis
names.
(parse_blend_design_map): Allow only a single design map.
(parse_encoding): Handle multiple encoding vectors.

* src/type42/t42parse.c (t42_parse_encoding): Handle multiple
encoding vectors.
This commit is contained in:
Werner Lemberg 2015-09-15 08:52:36 +02:00
parent 7f0f40116d
commit 19cb1127d4
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2015-09-15 Werner Lemberg <wl@gnu.org>
[type1, type42] Fix memory leaks (#45966).
* src/type1/t1load.c (parse_blend_axis_types): Handle multiple axis
names.
(parse_blend_design_map): Allow only a single design map.
(parse_encoding): Handle multiple encoding vectors.
* src/type42/t42parse.c (t42_parse_encoding): Handle multiple
encoding vectors.
2015-09-15 Werner Lemberg <wl@gnu.org>
[truetype] Fix integer type (#45965).

24
src/type1/t1load.c
View File

@ -615,6 +615,15 @@
goto Exit;
}
name = (FT_Byte*)blend->axis_names[n];
if ( name )
{
FT_TRACE0(( "parse_blend_axis_types:"
" overwriting axis name `%s' with `%*.s'\n",
name, len, token->start ));
FT_FREE( name );
}
if ( FT_ALLOC( blend->axis_names[n], len + 1 ) )
goto Exit;
@ -787,6 +796,13 @@
goto Exit;
}
if ( map->design_points )
{
FT_ERROR(( "parse_blend_design_map: duplicate table\n" ));
error = FT_THROW( Invalid_File_Format );
goto Exit;
}
/* allocate design map data */
if ( FT_NEW_ARRAY( map->design_points, num_points * 2 ) )
goto Exit;
@ -1205,6 +1221,14 @@
if ( parser->root.cursor >= limit )
return;
/* PostScript happily allows overwriting of encoding arrays */
if ( encode->char_index )
{
FT_FREE( encode->char_index );
FT_FREE( encode->char_name );
T1_Release_Table( char_table );
}
/* we use a T1_Table to store our charnames */
loader->num_chars = encode->num_chars = count;
if ( FT_NEW_ARRAY( encode->char_index, count ) ||

8
src/type42/t42parse.c
View File

@ -345,6 +345,14 @@
if ( parser->root.cursor >= limit )
return;
/* PostScript happily allows overwriting of encoding arrays */
if ( encode->char_index )
{
FT_FREE( encode->char_index );
FT_FREE( encode->char_name );
T1_Release_Table( char_table );
}
/* we use a T1_Table to store our charnames */
loader->num_chars = encode->num_chars = count;
if ( FT_NEW_ARRAY( encode->char_index, count ) ||