[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.
This commit is contained in:
parent
0ae3271814
commit
2dc76a4650
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2010-07-05 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
[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.
|
||||||
|
|
||||||
2010-07-04 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2010-07-04 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
Restrict the number of the charmaps in a rogue-compatible mode.
|
Restrict the number of the charmaps in a rogue-compatible mode.
|
||||||
|
|
|
@ -1339,12 +1339,12 @@
|
||||||
decoder->num_hints += num_args / 2;
|
decoder->num_hints += num_args / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* In a valid charstring there must be at least three bytes */
|
/* In a valid charstring there must be at least one byte */
|
||||||
/* after `hintmask' or `cntrmask' (two for a `moveto' */
|
/* after `hintmask' or `cntrmask' (e.g., for a `return' */
|
||||||
/* operator and one for `endchar'). Additionally, there */
|
/* instruction). Additionally, there must be space for */
|
||||||
/* must be space for `num_hints' bits. */
|
/* `num_hints' bits. */
|
||||||
|
|
||||||
if ( ( ip + 3 + ( ( decoder->num_hints + 7 ) >> 3 ) ) >= limit )
|
if ( ( ip + 1 + ( ( decoder->num_hints + 7 ) >> 3 ) ) >= limit )
|
||||||
goto Syntax_Error;
|
goto Syntax_Error;
|
||||||
|
|
||||||
if ( hinter )
|
if ( hinter )
|
||||||
|
|
Loading…
Reference in New Issue