shithub: freetype+ttf2subf

Download patch

ref: c06b9cf56d0421275f3dd39488613026f23b79f2
parent: ec7d2e5f683dab0d1471cbc1f25d0e65aae63b5d
author: Ben Wagner <[email protected]>
date: Thu Sep 28 15:08:38 EDT 2017

[truetype] Really, really fix #52082.

* src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.

git/fs: mount .git/fs: mount/attach disallowed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-28  Ben Wagner  <[email protected]>
+
+	[truetype] Really, really fix #52082.
+
+	* src/truetype/ttinterp.c (Ins_MDRP): Correct conditional.
+
 2017-09-28  Werner Lemberg  <[email protected]>
 
 	* 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;