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

[otvalid] Signedness fixes. 

* src/otvalid/otvcommn.c, src/otvalid/otvgdef.c,
src/otvalid/otvgpos.c, src/otvalid/otvgsub.c, src/otvalid/otvmath.c:
Apply.
This commit is contained in:
Werner Lemberg 2015-02-25 09:19:59 +01:00
parent 5c9d9bf295
commit d25ec16672
6 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2015-02-25 Werner Lemberg <wl@gnu.org>
[otvalid] Signedness fixes.
* src/otvalid/otvcommn.c, src/otvalid/otvgdef.c,
src/otvalid/otvgpos.c, src/otvalid/otvgsub.c, src/otvalid/otvmath.c:
Apply.
2015-02-25 Werner Lemberg <wl@gnu.org>
* src/bzip2/ftbzip2.c (ft_bzip2_alloc): Signedness fix.

2
src/otvalid/otvcommn.c
View File

@ -687,7 +687,7 @@
OTV_TRACE(( " (Count = %d)\n", Count ));
otv_Coverage_validate( table + Coverage, otvalid, Count );
otv_Coverage_validate( table + Coverage, otvalid, (FT_Int)Count );
OTV_LIMIT_CHECK( Count * 2 );

2
src/otvalid/otvgdef.c
View File

@ -61,7 +61,7 @@
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
otv_Coverage_validate( Coverage, otvalid, GlyphCount );
otv_Coverage_validate( Coverage, otvalid, (FT_Int)GlyphCount );
if ( GlyphCount != otv_Coverage_get_count( Coverage ) )
FT_INVALID_DATA;

8
src/otvalid/otvgpos.c
View File

@ -395,7 +395,9 @@
len_value = otv_value_length( ValueFormat );
otv_Coverage_validate( table + Coverage, otvalid, ValueCount );
otv_Coverage_validate( table + Coverage,
otvalid,
(FT_Int)ValueCount );
OTV_LIMIT_CHECK( ValueCount * len_value );
@ -605,7 +607,9 @@
OTV_TRACE(( " (EntryExitCount = %d)\n", EntryExitCount ));
otv_Coverage_validate( table + Coverage, otvalid, EntryExitCount );
otv_Coverage_validate( table + Coverage,
otvalid,
(FT_Int)EntryExitCount );
OTV_LIMIT_CHECK( EntryExitCount * 4 );

8
src/otvalid/otvgsub.c
View File

@ -70,11 +70,11 @@
otv_Coverage_validate( Coverage, otvalid, -1 );
idx = otv_Coverage_get_first( Coverage ) + DeltaGlyphID;
idx = (FT_Long)otv_Coverage_get_first( Coverage ) + DeltaGlyphID;
if ( idx < 0 )
FT_INVALID_DATA;
idx = otv_Coverage_get_last( Coverage ) + DeltaGlyphID;
idx = (FT_Long)otv_Coverage_get_last( Coverage ) + DeltaGlyphID;
if ( (FT_UInt)idx >= otvalid->glyph_count )
FT_INVALID_DATA;
}
@ -91,7 +91,9 @@
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
otv_Coverage_validate( table + Coverage, otvalid, GlyphCount );
otv_Coverage_validate( table + Coverage,
otvalid,
(FT_Int)GlyphCount );
OTV_LIMIT_CHECK( GlyphCount * 2 );

8
src/otvalid/otvmath.c
View File

@ -108,7 +108,7 @@
table_size = 4 + 4 * cnt;
OTV_SIZE_CHECK( Coverage );
otv_Coverage_validate( table + Coverage, otvalid, cnt );
otv_Coverage_validate( table + Coverage, otvalid, (FT_Int)cnt );
for ( i = 0; i < cnt; ++i )
{
@ -196,7 +196,7 @@
table_size = 4 + 8 * cnt;
OTV_SIZE_CHECK( Coverage );
otv_Coverage_validate( table + Coverage, otvalid, cnt );
otv_Coverage_validate( table + Coverage, otvalid, (FT_Int)cnt );
for ( i = 0; i < cnt; ++i )
{
@ -378,11 +378,11 @@
OTV_SIZE_CHECK( VCoverage );
if ( VCoverage )
otv_Coverage_validate( table + VCoverage, otvalid, vcnt );
otv_Coverage_validate( table + VCoverage, otvalid, (FT_Int)vcnt );
OTV_SIZE_CHECK( HCoverage );
if ( HCoverage )
otv_Coverage_validate( table + HCoverage, otvalid, hcnt );
otv_Coverage_validate( table + HCoverage, otvalid, (FT_Int)hcnt );
for ( i = 0; i < vcnt; ++i )
{