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

[cff] Fix value overflow. 

* src/cff/cffparse.c (cff_parse_fixed_scaled): Implement it.
This commit is contained in:
Bram Tassyns 2012-10-17 19:55:20 +02:00 committed by Werner Lemberg
parent 2df16761c9
commit 76accc184b
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-10-17 Bram Tassyns <BramT@enfocus.com>
[cff] Fix value overflow.
* src/cff/cffparse.c (cff_parse_fixed_scaled): Implement it.
2012-10-17 Werner Lemberg <wl@gnu.org>
[truetype] Fix Savannah bug #37572.

17
src/cff/cffparse.c
View File

@ -396,9 +396,20 @@
cff_parse_fixed_scaled( FT_Byte** d,
FT_Long scaling )
{
return **d == 30 ? cff_parse_real( d[0], d[1], scaling, NULL )
: ( cff_parse_integer( d[0], d[1] ) *
power_tens[scaling] ) << 16;
if ( **d == 30 )
return cff_parse_real( d[0], d[1], scaling, NULL );
else
{
FT_Long val = cff_parse_integer( d[0], d[1] ) * power_tens[scaling];
if ( val > 0x7FFF )
return 0x7FFFFFFFL;
else if ( val < -0x7FFF )
return -0x7FFFFFFFL;
return val << 16;
}
}