pcf: Fix a comparison between FT_Long and FT_ULong.

This commit is contained in:
suzuki toshiya 2009-08-01 00:32:24 +09:00
parent eceaffef3e
commit eec405540d
2 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
pcf: Fix a comparison between FT_Long and FT_ULong.
* src/pcf/pcfread.c (pcf_get_bitmaps): Return an error
if PCF_Face->nemetrics is negative.
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
gxvalid: Guarantee `nFeatureFlags' size up to 32-bit.

View File

@ -692,7 +692,8 @@ THE SOFTWARE.
FT_TRACE4(( " number of bitmaps: %d\n", nbitmaps ));
if ( nbitmaps != face->nmetrics )
/* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */
if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics )
return PCF_Err_Invalid_File_Format;
if ( FT_NEW_ARRAY( offsets, nbitmaps ) )