Commit c8c6763988ebc4ce1c93c099ae2401b677035c60
2017-03-30T21:07:17
* src/cff/cffparse.h (CFF2_DEFAULT_STACK): Set to 513 also. Requested by Dave Arnold.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/ChangeLog b/ChangeLog
index c741371..df655af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-03-30 Werner Lemberg <wl@gnu.org>
+ * src/cff/cffparse.h (CFF2_DEFAULT_STACK): Set to 513 also.
+
+ Requested by Dave Arnold.
+
+2017-03-30 Werner Lemberg <wl@gnu.org>
+
[truetype] Fix HVAR and VVAR handling (#50678).
* src/truetype/ttgxvar.c (tt_hvadvance_adjust): Handle
diff --git a/src/cff/cffparse.h b/src/cff/cffparse.h
index 9976d42..83d1bba 100644
--- a/src/cff/cffparse.h
+++ b/src/cff/cffparse.h
@@ -31,8 +31,16 @@ FT_BEGIN_HEADER
/* CFF uses constant parser stack size; */
/* CFF2 can increase from default 193 */
#define CFF_MAX_STACK_DEPTH 96
+
+ /*
+ * There are plans to remove the `maxstack' operator in a forthcoming
+ * revision of the CFF2 specification, increasing the (then static) stack
+ * size to 513. By making the default stack size equal to the maximum
+ * stack size, the operator is essentially disabled, which has the
+ * desired effect in FreeType.
+ */
#define CFF2_MAX_STACK 513
-#define CFF2_DEFAULT_STACK 193
+#define CFF2_DEFAULT_STACK 513
#define CFF_CODE_TOPDICT 0x1000
#define CFF_CODE_PRIVATE 0x2000