Better maxComponentDepth test.

18 years ago · 0f6f367ec1
parent 3033f4366b
commit 0f6f367ec1
1 changed files with 4 additions and 3 deletions
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@ -1084,9 +1084,10 @@
 #endif


-    /* some fonts haven't this field set correctly, */
-    /* thus we add 1 to catch the majority of them  */
-    if ( recurse_count > (FT_UInt)face->max_profile.maxComponentDepth + 1 )
+    /* some fonts have an incorrect value of `maxComponentDepth', */
+    /* thus we allow depth 1 to catch the majority of them        */
+    if ( recurse_count > 1                                   &&
+         recurse_count > face->max_profile.maxComponentDepth )
    {
      error = TT_Err_Invalid_Composite;
      goto Exit;