From 8ea854bfe92443706d55656072f891ec8f2cb3c2 Mon Sep 17 00:00:00 2001 From: Armin Hasitzka Date: Thu, 21 Feb 2019 10:14:57 +0000 Subject: [PATCH] [truetype] Mask numeric overflows. * src/truetype/ttinterp.c (Move_CVT, Move_CVT_Stretched, Ins_MIRP): Mask numeric overflows. Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11681 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11734 --- ChangeLog | 12 ++++++++++++ src/truetype/ttinterp.c | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb17e77ae..40564a307 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2019-02-21 Armin Hasitzka + + [truetype] Mask numeric overflows. + + * src/truetype/ttinterp.c (Move_CVT, Move_CVT_Stretched, Ins_MIRP): + Mask numeric overflows. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11681 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11734 + 2019-02-21 Armin Hasitzka [psaux] Mask numeric overflow. diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index fc8615b75..90676b809 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -1564,7 +1564,7 @@ FT_ULong idx, FT_F26Dot6 value ) { - exc->cvt[idx] += value; + exc->cvt[idx] = ADD_LONG( exc->cvt[idx], value ); } @@ -1573,7 +1573,8 @@ FT_ULong idx, FT_F26Dot6 value ) { - exc->cvt[idx] += FT_DivFix( value, Current_Ratio( exc ) ); + exc->cvt[idx] = ADD_LONG( exc->cvt[idx], + FT_DivFix( value, Current_Ratio( exc ) ); } @@ -6311,7 +6312,7 @@ if ( exc->GS.auto_flip ) { if ( ( org_dist ^ cvt_dist ) < 0 ) - cvt_dist = -cvt_dist; + cvt_dist = NEG_LONG( cvt_dist ); } #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY