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

* src/truetype/ttinterp.c (Ins_MIRP): Use SUB_LONG; avoid FT_ABS. 

Reported as

  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8706
This commit is contained in:
Werner Lemberg 2018-06-02 19:51:03 +02:00
parent fab10b6fc2
commit 67994e8221
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2018-06-02 Werner Lemberg <wl@gnu.org>
* src/truetype/ttinterp.c (Ins_MIRP): Use SUB_LONG; avoid FT_ABS.
Reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8706
2018-06-02 Werner Lemberg <wl@gnu.org>
* src/autofit/afwarp.h: Use AF_CONFIG_OPTION_USE_WARPER (#54033).

15
src/truetype/ttinterp.c
View File

@ -6189,6 +6189,8 @@
FT_Bool reverse_move = FALSE;
#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
FT_F26Dot6 delta;
minimum_distance = exc->GS.minimum_distance;
control_value_cutin = exc->GS.control_value_cutin;
@ -6221,8 +6223,11 @@
/* single width test */
if ( FT_ABS( cvt_dist - exc->GS.single_width_value ) <
exc->GS.single_width_cutin )
delta = SUB_LONG( cvt_dist, exc->GS.single_width_value );
if ( delta < 0 )
delta = NEG_LONG( delta );
if ( delta < exc->GS.single_width_cutin )
{
if ( cvt_dist >= 0 )
cvt_dist = exc->GS.single_width_value;
@ -6276,9 +6281,6 @@
if ( exc->GS.gep0 == exc->GS.gep1 )
{
FT_F26Dot6 delta;
/* XXX: According to Greg Hitchcock, the following wording is */
/* the right one: */
/* */
@ -6313,9 +6315,6 @@
exc->ignore_x_mode &&
exc->GS.gep0 == exc->GS.gep1 )
{
FT_F26Dot6 delta;
delta = SUB_LONG( cvt_dist, org_dist );
if ( delta < 0 )
delta = NEG_LONG( delta );