diff options
| author | Werner Lemberg <wl@gnu.org> | 2010-07-05 06:40:02 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2010-07-05 06:40:02 +0200 |
| commit | 2dc76a46509d1acbbbdf82987a690c0f9f777b92 (patch) | |
| tree | afebc30faa0136e2234bd375ee8771f5ac84318b /src/cff/cffgload.c | |
| parent | 0ae3271814982524dfd210dee09031c2430d473f (diff) | |
| download | freetype2-2dc76a46509d1acbbbdf82987a690c0f9f777b92.tar.gz | |
[cff] Next try to fix `hintmask' and `cntrmask' limit check.
Problem reported by malc <av1474@comtv.ru>.
* src/cff/cffgload.c (cff_decoder_parse_charstrings)
<cff_op_hintmask>: It is possible that there is just a single byte
after the `hintmask' or `cntrmask', e.g., a `return' instruction.
Diffstat (limited to 'src/cff/cffgload.c')
| -rw-r--r-- | src/cff/cffgload.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index f81b2f40a..4a5f8f006 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -1339,12 +1339,12 @@ decoder->num_hints += num_args / 2; } - /* In a valid charstring there must be at least three bytes */ - /* after `hintmask' or `cntrmask' (two for a `moveto' */ - /* operator and one for `endchar'). Additionally, there */ - /* must be space for `num_hints' bits. */ + /* In a valid charstring there must be at least one byte */ + /* after `hintmask' or `cntrmask' (e.g., for a `return' */ + /* instruction). Additionally, there must be space for */ + /* `num_hints' bits. */ - if ( ( ip + 3 + ( ( decoder->num_hints + 7 ) >> 3 ) ) >= limit ) + if ( ( ip + 1 + ( ( decoder->num_hints + 7 ) >> 3 ) ) >= limit ) goto Syntax_Error; if ( hinter ) |