diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:39 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:39 +0900 |
| commit | 1e1cb06cf96f27e9a4fcd05a08aa7c0bc80ddbbd (patch) | |
| tree | c876c0ed0bac15265ed68b2dbab4105dedd5836b | |
| parent | 277733fc8d097d6cdf1996c707227b51aa38edd6 (diff) | |
| download | freetype2-1e1cb06cf96f27e9a4fcd05a08aa7c0bc80ddbbd.tar.gz | |
pcf: Fix a comparison between FT_Long and FT_ULong.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/pcf/pcfread.c | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2009-07-03 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-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + gxvalid: Guarantee `nFeatureFlags' size up to 32-bit. * src/gxvalid/gxvmort.c (gxv_mort_featurearray_validate): diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 9cce3f570..cdef433bc 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -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 ) ) |