[freetype2] master c06b9cf: [truetype] Really, really fix #52082.

[Werner LEMBERG]

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

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

diff --git a/ChangeLog b/ChangeLog
index 7a613b1..19f54a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-28  Ben Wagner  <address@hidden>
+
+       [truetype] Really, really fix #52082.
+
+       * src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.
+
 2017-09-28  Werner Lemberg  <address@hidden>
 
        * src/psaux/psintrp.c (cf2_doStems): Fix integer overflow.
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 50eb246..2bb43ec 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -6079,11 +6079,11 @@
     /* single width cut-in test */
 
     /* |org_dist - single_width_value| < 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 ( 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;