ftobjs.c: Prevent an overflow in glyph index handling.

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d35b0f632..faf9087b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-07-03  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
+	ftobjs.c: Prevent an overflow in glyph index handling.
+
+	* src/base/ftobjs.c (FT_Face_GetCharsOfVariant):
+	Improve the cast in comparison to avoid the truncation.
+
+2009-07-03  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
 	Improve the variable types in raccess_make_file_name().
 
 	* src/base/ftrfork.c (raccess_make_file_name):
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 5bb4e4ec8..6325af36e 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -3297,7 +3297,7 @@
       ((FT_Byte*)buffer)[0] = 0;
 
     if ( face                                     &&
-         glyph_index <= (FT_UInt)face->num_glyphs &&
+         (FT_Long)glyph_index <= face->num_glyphs &&
          FT_HAS_GLYPH_NAMES( face )               )
     {
       FT_Service_GlyphDict  service;