minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[woff2] Fix compiler warnings. 

* src/sfnt/sfwoff2.c (read_num_hmetrics): Remove unused argument
`table_len'.
Update caller.
(triplet_decode, compute_bbox, store_loca, reconstruct_glyf): Make
`i' variable unsigned.
(reconstruct_glyph): Remove condition which is always false.
(reconstruct_html): Removed unused argument `transformed_size'.
Update caller.

* src/sfnt/woff2tags.c (woff2_known_tags): Remove condition which is
always false.
This commit is contained in:
Werner Lemberg 2019-08-27 10:43:32 +02:00
parent 60c52f0edb
commit eef5c1dd14
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2019-08-27 Werner Lemberg <wl@gnu.org>
[woff2] Fix compiler warnings.
* src/sfnt/sfwoff2.c (read_num_hmetrics): Remove unused argument
`table_len'.
Update caller.
(triplet_decode, compute_bbox, store_loca, reconstruct_glyf): Make
`i' variable unsigned.
(reconstruct_glyph): Remove condition which is always false.
(reconstruct_html): Removed unused argument `transformed_size'.
Update caller.
* src/sfnt/woff2tags.c (woff2_known_tags): Remove condition which is
always false.
2019-08-27 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>
[woff2] Check whether known tag is in array bounds.

17
src/sfnt/sfwoff2.c
View File

@ -366,7 +366,6 @@
/* Read `numberOfHMetrics' field from `hhea' table. */
static FT_Error
read_num_hmetrics( FT_Stream stream,
FT_ULong table_len,
FT_UShort* num_hmetrics )
{
FT_Error error = FT_Err_Ok;
@ -433,7 +432,7 @@
FT_ULong triplet_index = 0;
FT_ULong data_bytes;
FT_Int i;
FT_UInt i;
if ( n_points > in_size )
@ -673,7 +672,8 @@
FT_Int y_min = 0;
FT_Int x_max = 0;
FT_Int y_max = 0;
FT_Int i;
FT_UInt i;
FT_ULong offset;
FT_Byte* pointer;
@ -778,7 +778,7 @@
FT_Byte* loca_buf = NULL;
FT_Byte* dst = NULL;
FT_Int i = 0;
FT_UInt i = 0;
FT_ULong loca_buf_size;
const FT_ULong offset_size = index_format ? 4 : 2;
@ -849,7 +849,7 @@
FT_UShort index_format;
FT_ULong expected_loca_length;
FT_UInt offset;
FT_Int i;
FT_UInt i;
FT_ULong points_size;
FT_ULong bitmap_length;
FT_ULong glyph_buf_size;
@ -1099,8 +1099,7 @@
substreams[GLYPH_STREAM].offset = FT_STREAM_POS();
if ( total_n_points >= ( 1 << 27 ) ||
instruction_size >= ( 1 << 30 ) )
if ( total_n_points >= ( 1 << 27 ) )
goto Fail;
size_needed = 12 +
@ -1333,7 +1332,6 @@
static FT_Error
reconstruct_hmtx( FT_Stream stream,
FT_ULong transformed_size,
FT_UShort num_glyphs,
FT_UShort num_hmetrics,
FT_Short* x_mins,
@ -1564,7 +1562,7 @@
/* Get stream size for fields of `hmtx' table. */
if ( table.Tag == TTAG_hhea )
{
if ( read_num_hmetrics( stream, table.src_length, &num_hmetrics ) )
if ( read_num_hmetrics( stream, &num_hmetrics ) )
return FT_THROW( Invalid_Table );
}
@ -1633,7 +1631,6 @@
table.dst_offset = dest_offset;
if ( reconstruct_hmtx( stream,
table.src_length,
info->num_glyphs,
info->num_hmetrics,
info->x_mins,

2
src/sfnt/woff2tags.c
View File

@ -101,7 +101,7 @@
};
if ( index < 0 || index > 62 )
if ( index > 62 )
return 0;
return known_tags[index];