psaux: Prevent invalid arguments to afm_parser_read_vals().
This commit is contained in:
parent
0d226c31c5
commit
d3ed6d1bba
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
psaux: Prevent invalid arguments to afm_parser_read_vals().
|
||||||
|
|
||||||
|
* src/psaux/afmparse.c (afm_parser_read_vals): Change
|
||||||
|
the type of `n' to prevent negative number how many
|
||||||
|
arguments should be parsed.
|
||||||
|
|
||||||
|
* src/psaux/afmparse.h (afm_parser_read_vals): Ditto.
|
||||||
|
|
||||||
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
base: Prevent some overflows on LP64 systems.
|
base: Prevent some overflows on LP64 systems.
|
||||||
|
|
|
@ -366,11 +366,11 @@
|
||||||
FT_LOCAL_DEF( FT_Int )
|
FT_LOCAL_DEF( FT_Int )
|
||||||
afm_parser_read_vals( AFM_Parser parser,
|
afm_parser_read_vals( AFM_Parser parser,
|
||||||
AFM_Value vals,
|
AFM_Value vals,
|
||||||
FT_Int n )
|
FT_UInt n )
|
||||||
{
|
{
|
||||||
AFM_Stream stream = parser->stream;
|
AFM_Stream stream = parser->stream;
|
||||||
char* str;
|
char* str;
|
||||||
FT_Int i;
|
FT_UInt i;
|
||||||
|
|
||||||
|
|
||||||
if ( n > AFM_MAX_ARGUMENTS )
|
if ( n > AFM_MAX_ARGUMENTS )
|
||||||
|
|
|
@ -71,7 +71,7 @@ FT_BEGIN_HEADER
|
||||||
FT_LOCAL( FT_Int )
|
FT_LOCAL( FT_Int )
|
||||||
afm_parser_read_vals( AFM_Parser parser,
|
afm_parser_read_vals( AFM_Parser parser,
|
||||||
AFM_Value vals,
|
AFM_Value vals,
|
||||||
FT_Int n );
|
FT_UInt n );
|
||||||
|
|
||||||
/* read the next key from the next line or column */
|
/* read the next key from the next line or column */
|
||||||
FT_LOCAL( char* )
|
FT_LOCAL( char* )
|
||||||
|
|
Loading…
Reference in New Issue