[freetype2] master 63be40b 5/5: [truetype] Really fix #52082.

[Werner LEMBERG]

branch: master
commit 63be40bccf02bd280da14c0249658e5531b3ea20
Author: Ben Wagner <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [truetype] Really fix #52082.
    
    * src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.
---
 ChangeLog               | 6 ++++++
 src/truetype/ttinterp.c | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74ecf96..fe62b19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-23  Ben Wagner  <address@hidden>
+
+       [truetype] Really fix #52082.
+
+       * src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.
+
 2017-09-23  Werner Lemberg  <address@hidden>
 
        [otvalid] Handle `GDEF' v1.2 and v1.3 tables.
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index e3c8f12..50eb246 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -6079,8 +6079,11 @@
     /* single width cut-in test */
 
     /* |org_dist - single_width_value| < single_width_cutin */
-    if ( org_dist < exc->GS.single_width_value + exc->GS.single_width_cutin ||
-         org_dist > exc->GS.single_width_value - exc->GS.single_width_cutin )
+    if ( exc->GS.single_width_cutin > 0              &&
+         ( org_dist < exc->GS.single_width_value +
+                        exc->GS.single_width_cutin ||
+           org_dist > exc->GS.single_width_value -
+                        exc->GS.single_width_cutin ) )
     {
       if ( org_dist >= 0 )
         org_dist = exc->GS.single_width_value;