rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

psaux: Prevent invalid arguments to afm_parser_read_vals().

This commit is contained in:
suzuki toshiya 2009-08-01 00:30:24 +09:00
parent 0d226c31c5
commit d3ed6d1bba
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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>
base: Prevent some overflows on LP64 systems.

4
src/psaux/afmparse.c
View File

@ -366,11 +366,11 @@
FT_LOCAL_DEF( FT_Int )
afm_parser_read_vals( AFM_Parser parser,
AFM_Value vals,
FT_Int n )
FT_UInt n )
{
AFM_Stream stream = parser->stream;
char* str;
FT_Int i;
FT_UInt i;
if ( n > AFM_MAX_ARGUMENTS )

2
src/psaux/afmparse.h
View File

@ -71,7 +71,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Int )
afm_parser_read_vals( AFM_Parser parser,
AFM_Value vals,
FT_Int n );
FT_UInt n );
/* read the next key from the next line or column */
FT_LOCAL( char* )