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

* src/pfr/pfrload.c (pfr_log_font_count): Better font size estimate.

This commit is contained in:
Werner Lemberg 2016-03-30 09:11:02 +02:00
parent ccd771cdf6
commit aff6ebb9a6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2016-03-30 Werner Lemberg <wl@gnu.org>
* src/pfr/pfrload.c (pfr_log_font_count): Better font size estimate.
2016-03-30 Werner Lemberg <wl@gnu.org>
* src/pfr/pfrload.c (pfr_aux_name_load): Fix memory leak (#47567).

10
src/pfr/pfrload.c
View File

@ -299,9 +299,15 @@
FT_READ_USHORT( count ) )
goto Exit;
/* check maximum value and a rough minimum size */
/* check maximum value and a rough minimum size: */
/* - no more than 13106 log fonts */
/* - we need 5 bytes for a log header record */
/* - we need at least 18 bytes for a log font record */
/* - the overall size is at least 95 bytes plus the */
/* log header and log font records */
if ( count > ( ( 1 << 16 ) - 2 ) / 5 ||
2 + count * 5 >= stream->size - section_offset )
2 + count * 5 >= stream->size - section_offset ||
95 + count * ( 5 + 18 ) >= stream->size )
{
FT_ERROR(( "pfr_log_font_count:"
" invalid number of logical fonts\n" ));