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

[woff2] Fix memory leaks. 

One of them reported as

  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=17766

* src/sfnt/sfwoff2.c (woff2_open_font): Free `info->x_mins' and
`woff2->ttc_fonts'.

(reconstruct_glyf): Initialize `info->x_mins'.
This commit is contained in:
Werner Lemberg 2019-09-28 07:37:24 +02:00
parent b39576f984
commit 2bf603bde6
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2019-09-28 Werner Lemberg <wl@gnu.org>
[woff2] Fix memory leaks.
One of them reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=17766
* src/sfnt/sfwoff2.c (woff2_open_font): Free `info->x_mins' and
`woff2->ttc_fonts'.
(reconstruct_glyf): Initialize `info->x_mins'.
2019-09-27 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/ftstroke.c (ft_stroker_cap): Speed up caps.

20
src/sfnt/sfwoff2.c
View File

@ -927,6 +927,7 @@
if ( FT_NEW_ARRAY( glyph_buf, glyph_buf_size ) )
goto Fail;
info->x_mins = NULL;
if ( FT_NEW_ARRAY( info->x_mins, num_glyphs ) )
goto Fail;
@ -2007,8 +2008,10 @@
}
/* Collection directory reading complete. */
FT_TRACE2(( "WOFF2 collection dirtectory is valid.\n" ));
FT_TRACE2(( "WOFF2 collection directory is valid.\n" ));
}
else
woff2.ttc_fonts = NULL;
woff2.compressed_offset = FT_STREAM_POS();
file_offset = ROUND4( woff2.compressed_offset +
@ -2234,6 +2237,21 @@
FT_FREE( tables );
FT_FREE( indices );
FT_FREE( uncompressed_buf );
FT_FREE( info.x_mins );
if ( woff2.ttc_fonts )
{
WOFF2_TtcFont ttc_font = woff2.ttc_fonts;
for ( nn = 0; nn < woff2.num_fonts; nn++ )
{
FT_FREE( ttc_font->table_indices );
ttc_font++;
}
FT_FREE( woff2.ttc_fonts );
}
if ( error )
{