diff options
| author | Parth Wazurkar <parthwazurkar@gmail.com> | 2018-07-14 11:21:20 +0530 |
|---|---|---|
| committer | Parth Wazurkar <parthwazurkar@gmail.com> | 2018-07-20 16:49:24 +0530 |
| commit | eaa830405ef8646efa2edf2e1205ec1688113700 (patch) | |
| tree | 0513b355a5fc768ab7614b9dd2c8e5862513730f | |
| parent | ed698a3b3b8a661e99cb7923178c7ece594c8397 (diff) | |
| download | freetype2-eaa830405ef8646efa2edf2e1205ec1688113700.tar.gz | |
[gf] Robustify.
* src/gf/gflib.c (gf_load_font): Add check
for GF_ID and GF_PRE commands to improve
test for `gf' files.
| -rw-r--r-- | src/gf/gflib.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/gf/gflib.c b/src/gf/gflib.c index ea2749575..003674f0f 100644 --- a/src/gf/gflib.c +++ b/src/gf/gflib.c @@ -309,7 +309,7 @@ unsigned char bit_table[] = { { GF_Glyph go; GF_Bitmap bm; - UINT1 instr, d; + UINT1 instr, d, pre, id, k; UINT4 ds, check_sum, hppp, vppp; INT4 min_m, max_m, min_n, max_n; INT4 w; @@ -323,6 +323,29 @@ unsigned char bit_table[] = { go = NULL; nchars = -1; + if( FT_STREAM_SEEK( 0 ) ) + goto Exit; + + pre = READ_UINT1( stream ); + if (pre != GF_PRE) + { + FT_ERROR(( "gf_load_font: missing GF_PRE(247) field\n" )); + error = FT_THROW( Unknown_File_Format ); + goto Exit; + } + + id = READ_UINT1( stream ); + if (id != GF_ID) + { + FT_ERROR(( "gf_load_font: missing GF_ID(131) field\n" )); + error = FT_THROW( Unknown_File_Format ); + goto Exit; + } + + k = READ_UINT1( stream ); + if ( FT_STREAM_SKIP( k ) ) + goto Exit; + /* seek to post_post instr. */ /* fseek(fp, -1, SEEK_END); */ if( FT_STREAM_SEEK( stream->size - 1 ) ) @@ -510,11 +533,14 @@ unsigned char bit_table[] = { goto Exit; } + /* if( w > max_m) { FT_ERROR(( "gf_load_font: invalid width in charloc\n" )); goto Exit; } + */ + /* optr = ft_ftell(fp); */ optr = stream->pos; /* ft_fseek(fp, ptr, SEEK_SET); */ |