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

[cff] More consistency checks for pure CFFs. 

Reported as

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

* src/cff/cffload.c (cff_font_load): Check element number and size
of Name and Top DICT indices.
This commit is contained in:
Werner Lemberg 2017-01-04 10:00:49 +01:00
parent 025226ae14
commit c9d477242c
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2017-01-04 Werner Lemberg <wl@gnu.org>
[cff] More consistency checks for pure CFFs.
Reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=378
* src/cff/cffload.c (cff_font_load): Check element number and size
of Name and Top DICT indices.
2017-01-04 Werner Lemberg <wl@gnu.org>
[cff, truetype] Minor tracing improvement.

19
src/cff/cffload.c
View File

@ -2199,6 +2199,16 @@
goto Exit;
}
/* font names must not be empty */
if ( font->name_index.data_size < font->name_index.count )
{
/* for pure CFFs, we still haven't checked enough bytes */
/* to be sure that it is a CFF at all */
error = pure_cff ? FT_THROW( Unknown_File_Format )
: FT_THROW( Invalid_File_Format );
goto Exit;
}
if ( FT_SET_ERROR( cff_index_init( &font->font_dict_index,
stream, 0, cff2 ) ) ||
FT_SET_ERROR( cff_index_init( &string_index,
@ -2210,6 +2220,15 @@
&font->string_pool,
&font->string_pool_size ) ) )
goto Exit;
/* there must be a Top DICT index entry for each name index entry */
if ( font->name_index.count > font->font_dict_index.count )
{
FT_ERROR(( "cff_font_load:"
" not enough entries in Top DICT index\n" ));
error = FT_THROW( Invalid_File_Format );
goto Exit;
}
}
font->num_strings = string_index.count;