From dfce4760af0707a95701e861a42b5950879dcbab Mon Sep 17 00:00:00 2001
From: Dave Arnold <darnold@adobe.com>
Date: Fri, 11 Nov 2016 14:16:21 -0800
Subject: [PATCH] Don't allow CFF2 charstrings to specify a width

---
 src/cff/cf2intrp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cff/cf2intrp.c b/src/cff/cf2intrp.c
index 4bfaa649d..0cbee559a 100644
--- a/src/cff/cf2intrp.c
+++ b/src/cff/cf2intrp.c
@@ -547,8 +547,10 @@
      * If one of the above operators occurs without explicitly specifying
      * a width, we assume the default width.
      *
+     * CFF2 charstrings always return the default width (0)
+     *
      */
-    haveWidth = FALSE;
+    haveWidth = font->isCFF2 ? TRUE : FALSE;
     *width    = cf2_getDefaultWidthX( decoder );
 
     /*