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

Merge branch 'master' of git.sv.gnu.org:/srv/git/freetype/freetype2 into arv-testing

This commit is contained in:
Arvinder Bhathal 2017-07-03 15:53:35 -04:00
parent 9cac265289 ca799e9be5
commit 2572b1bea7
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2017-07-03 Werner Lemberg <wl@gnu.org>
[truetype] Integer overflow.
Reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2455
* src/truetype/ttinterp.c (Ins_SCFS): Use SUB_LONG.
2017-07-01 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/sfnt/sfobjs.c (sfnt_load_face): Ignore No_Unicode_Glyph_Name.
2017-06-28 Ben Wagner <bungeman@google.com>
Avoid Microsoft compiler warnings (#51331).

3
src/sfnt/sfobjs.c
View File

@ -1509,7 +1509,8 @@
NULL, &cmaprec, NULL );
if ( error &&
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) )
FT_TRACE2(( "sfnt_load_face: failed to emulate Unicode\n" ));
goto Exit;
error = FT_Err_Ok;
#endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */

2
src/truetype/ttinterp.c
View File

@ -4803,7 +4803,7 @@
K = FAST_PROJECT( &exc->zp2.cur[L] );
exc->func_move( exc, &exc->zp2, L, args[1] - K );
exc->func_move( exc, &exc->zp2, L, SUB_LONG( args[1], K ) );
/* UNDOCUMENTED! The MS rasterizer does that with */
/* twilight points (confirmed by Greg Hitchcock) */