ref: 3bfb1c08c16895774533511841275471959ae05d
parent: b82e773b34c35d48483c1bc111e4dcf9ef419147
author: Werner Lemberg <[email protected]>
date: Mon Aug 29 07:59:18 EDT 2005
* src/truetype/ttgload.c [TT_MAX_COMPOSITE_RECURSE]: Removed. (load_truetype_glyph): Limit recursion depth by `maxComponentDepth'.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-28 George Williams <[email protected]>
+
+ * src/truetype/ttgload.c [TT_MAX_COMPOSITE_RECURSE]: Removed.
+ (load_truetype_glyph): Limit recursion depth by `maxComponentDepth'.
+
2005-08-25 J. Ali Harlow <[email protected]>
* builds/unix/freetype2.in (CFlags): Add missing directory.
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -63,15 +63,6 @@
#define UNSCALED_COMPONENT_OFFSET 0x1000
-/* Maximum recursion depth we allow for composite glyphs.
- * The TrueType spec doesn't say anything about recursion,
- * so it isn't clear that recursion is allowed at all. But
- * we'll be generous.
- */
-#define TT_MAX_COMPOSITE_RECURSE 5
-
-
-
/*************************************************************************/
/* */
/* <Function> */
@@ -1221,7 +1212,7 @@
#endif
- if ( recurse_count >= TT_MAX_COMPOSITE_RECURSE )
+ if ( recurse_count >= face->max_profile.maxComponentDepth )
{error = TT_Err_Invalid_Composite;
goto Exit;