From d1c23082b65824824457fc02435e5c8cfd23817f Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Sat, 1 Aug 2009 00:32:17 +0900 Subject: [PATCH] truetype: Check invalid function number in FDEF instruction. --- ChangeLog | 7 +++++++ src/truetype/ttinterp.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b91d0294a..9696b52f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-07-31 suzuki toshiya + + truetype: Check invalid function number in FDEF instruction. + + * src/truetype/ttinterp.c (Ins_FDEF): Check + if the operand fits 16-bit function number. + 2009-07-31 suzuki toshiya truetype: Truncate the deltas of composite glyph at 16-bit values. diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index e6a0700a4..816d1dad4 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -4290,13 +4290,21 @@ CUR.numFDefs++; } + /* Although FDEF takes unsigned 32-bit integer, */ + /* func # must be within unsigned 16-bit integer */ + if ( n > 0xFFFFU ) + { + CUR.error = TT_Err_Too_Many_Function_Defs; + return; + } + rec->range = CUR.curRange; - rec->opc = n; + rec->opc = (FT_UInt16)n; rec->start = CUR.IP + 1; rec->active = TRUE; if ( n > CUR.maxFunc ) - CUR.maxFunc = n; + CUR.maxFunc = (FT_UInt16)n; /* Now skip the whole function definition. */ /* We don't allow nested IDEFS & FDEFs. */