[freetype2] int-not32-changes-2017 8f36537 09/25: use FT_UInt32 type to check UCS-2 codepoint overflow in cmap format 4 parser.

[suzuki toshiya]

branch: int-not32-changes-2017
commit 8f36537406fca7b1f2a492db707e0b58a4720e43
Author: suzuki toshiya <address@hidden>
Commit: suzuki toshiya <address@hidden>

    use FT_UInt32 type to check UCS-2 codepoint overflow in cmap format 4 
parser.
    note: long type is too large for LP64 platforms.
---
 src/sfnt/ttcmap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index b995e5c..f8d5707 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -836,8 +836,8 @@
                    (FT_Int)end + delta >= 0     )
                 charcode = (FT_UInt)( -delta );
 
-              else if ( (FT_Int)charcode + delta < 0x10000L &&
-                        (FT_Int)end + delta >= 0x10000L     )
+              else if ( (FT_Int32)charcode + delta < 0x10000L &&
+                        (FT_Int32)end + delta >= 0x10000L     )
                 charcode = (FT_UInt)( 0x10000L - delta );
 
               else
@@ -1169,8 +1169,8 @@
                  (FT_Int)end + delta >= 0     )
               charcode = (FT_UInt)( -delta );
 
-            else if ( (FT_Int)charcode + delta < 0x10000L &&
-                      (FT_Int)end + delta >= 0x10000L     )
+            else if ( (FT_Int32)charcode + delta < 0x10000L &&
+                      (FT_Int32)end + delta >= 0x10000L     )
               charcode = (FT_UInt)( 0x10000L - delta );
 
             else
@@ -1407,8 +1407,8 @@
                  (FT_Int)end + delta >= 0     )
               charcode = (FT_UInt)( -delta );
 
-            else if ( (FT_Int)charcode + delta < 0x10000L &&
-                      (FT_Int)end + delta >= 0x10000L     )
+            else if ( (FT_Int32)charcode + delta < 0x10000L &&
+                      (FT_Int32)end + delta >= 0x10000L     )
               charcode = (FT_UInt)( 0x10000L - delta );
           }
         }