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

[truetype] Really, really fix #52082. 

* src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.
This commit is contained in:
Ben Wagner 2017-09-28 19:08:38 +02:00 committed by Werner Lemberg
parent ec7d2e5f68
commit c06b9cf56d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2017-09-28 Ben Wagner <bungeman@google.com>
[truetype] Really, really fix #52082.
* src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.
2017-09-28 Werner Lemberg <wl@gnu.org> 2017-09-28 Werner Lemberg <wl@gnu.org>
* src/psaux/psintrp.c (cf2_doStems): Fix integer overflow. * src/psaux/psintrp.c (cf2_doStems): Fix integer overflow.

10
src/truetype/ttinterp.c
View File

@ -6079,11 +6079,11 @@
/* single width cut-in test */ /* single width cut-in test */
/* |org_dist - single_width_value| < single_width_cutin */ /* |org_dist - single_width_value| < single_width_cutin */
if ( exc->GS.single_width_cutin > 0 && if ( exc->GS.single_width_cutin > 0 &&
( org_dist < exc->GS.single_width_value + org_dist < exc->GS.single_width_value +
exc->GS.single_width_cutin || exc->GS.single_width_cutin &&
org_dist > exc->GS.single_width_value - org_dist > exc->GS.single_width_value -
exc->GS.single_width_cutin ) ) exc->GS.single_width_cutin )
{ {
if ( org_dist >= 0 ) if ( org_dist >= 0 )
org_dist = exc->GS.single_width_value; org_dist = exc->GS.single_width_value;