minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/truetype/ttgload.c [TT_MAX_COMPOSITE_RECURSE]: Removed. 

(load_truetype_glyph): Limit recursion depth by `maxComponentDepth'.
This commit is contained in:
Werner Lemberg 2005-08-29 11:59:18 +00:00
parent b82e773b34
commit 3bfb1c08c1
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-08-28 George Williams <gww@silcom.com>
* src/truetype/ttgload.c [TT_MAX_COMPOSITE_RECURSE]: Removed.
(load_truetype_glyph): Limit recursion depth by `maxComponentDepth'.
2005-08-25 J. Ali Harlow <ali@avrc.city.ac.uk>
* builds/unix/freetype2.in (CFlags): Add missing directory.

11
src/truetype/ttgload.c
View File

@ -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;