[cff] Final try to fix `hintmask' and `cntrmask' limit check.

Problem reported by Tobias Wolf <towolf@gmail.com>.

* src/cff/cffgload.c (cff_decoder_parse_charstrings)
<cff_op_hintmask>: Sigh.  I'm apparently too silly to fix this
correctly in less than three tries.
This commit is contained in:
Werner Lemberg 2010-07-17 13:39:50 +02:00
parent 072afbdbac
commit 2de6b8a3db
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,13 @@
2010-07-17 Werner Lemberg <wl@gnu.org>
[cff] Final try to fix `hintmask' and `cntrmask' limit check.
Problem reported by Tobias Wolf <towolf@gmail.com>.
* src/cff/cffgload.c (cff_decoder_parse_charstrings)
<cff_op_hintmask>: Sigh. I'm apparently too silly to fix this
correctly in less than three tries.
2010-07-12 Werner Lemberg <wl@gnu.org>
* Version 2.4.0 released.

View File

@ -1344,7 +1344,7 @@
/* instruction). Additionally, there must be space for */
/* `num_hints' bits. */
if ( ( ip + 1 + ( ( decoder->num_hints + 7 ) >> 3 ) ) >= limit )
if ( ( ip + ( ( decoder->num_hints + 7 ) >> 3 ) ) >= limit )
goto Syntax_Error;
if ( hinter )