[truetype] Really, really fix #52082.

* src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.
7 years ago · c06b9cf56d
parent ec7d2e5f68
commit c06b9cf56d
2 changed files with 11 additions and 5 deletions
--- a/6
+++ b/6
@ -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>

 	* src/psaux/psintrp.c (cf2_doStems): Fix integer overflow.
--- 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;