[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] int-not32-changes-2017 63748d0 08/23: use FT_UInt32 type to
From: |
suzuki toshiya |
Subject: |
[freetype2] int-not32-changes-2017 63748d0 08/23: use FT_UInt32 type to check UCS-2 codepoint overflow in cmap format 4 parser. |
Date: |
Tue, 12 Sep 2017 22:13:34 -0400 (EDT) |
branch: int-not32-changes-2017
commit 63748d08b73acdeaed7ea6bd13e4b03fe2cd8c5e
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 );
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] int-not32-changes-2017 63748d0 08/23: use FT_UInt32 type to check UCS-2 codepoint overflow in cmap format 4 parser.,
suzuki toshiya <=