gxvalid: Guarantee `nFeatureFlags' size up to 32-bit.

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a592676c..838192765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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):
+	Extend the 3rd argument `nFeatureFlags' to FT_ULong.
+	* src/gxvalid/gxvmort.h: Ditto.
+
+2009-07-03  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
 	sfnt: Insert explicit cast for LP64 system.
 
 	* src/sfnt/ttkern.c (tt_face_load_kern): Insert
diff --git a/src/gxvalid/gxvmort.c b/src/gxvalid/gxvmort.c
index f4fbd30e4..0aa066339 100644
--- a/src/gxvalid/gxvmort.c
+++ b/src/gxvalid/gxvmort.c
@@ -85,17 +85,17 @@
 
 
   /*
-   * nFeatureFlags is typed to FT_UInt to accept that in
+   * nFeatureFlags is typed to FT_ULong to accept that in
    * mort (typed FT_UShort) and morx (typed FT_ULong).
    */
   FT_LOCAL_DEF( void )
   gxv_mort_featurearray_validate( FT_Bytes       table,
                                   FT_Bytes       limit,
-                                  FT_UInt        nFeatureFlags,
+                                  FT_ULong       nFeatureFlags,
                                   GXV_Validator  valid )
   {
     FT_Bytes  p = table;
-    FT_UInt   i;
+    FT_ULong  i;
 
     GXV_mort_featureRec  f = GXV_MORT_FEATURE_OFF;
 
diff --git a/src/gxvalid/gxvmort.h b/src/gxvalid/gxvmort.h
index 1d64e69c4..1e5a1f5ab 100644
--- a/src/gxvalid/gxvmort.h
+++ b/src/gxvalid/gxvmort.h
@@ -54,7 +54,7 @@
   FT_LOCAL( void )
   gxv_mort_featurearray_validate( FT_Bytes       table,
                                   FT_Bytes       limit,
-                                  FT_UInt        nFeatureFlags,
+                                  FT_ULong       nFeatureFlags,
                                   GXV_Validator  valid );
 
   FT_LOCAL( void )