rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use FT_UInt32 type to check UCS-2 codepoint overflow in cmap format 4 parser. 

note: long type is too large for LP64 platforms.
This commit is contained in:
suzuki toshiya 2017-09-11 17:26:05 +09:00
parent 58dd3a1e6e
commit 8f36537406
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sfnt/ttcmap.c
View File

@ -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 );
}
}