diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-12-24 09:27:15 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-12-24 09:27:15 +0100 |
| commit | a300c1c3af3b7e99a71127e33be1e3d622ec9f9a (patch) | |
| tree | 6d023a881c276d4666a8fb00fb08ca5596599a72 | |
| parent | d1db57c284c9139fc520354c79af6a59bebc556b (diff) | |
| download | freetype2-a300c1c3af3b7e99a71127e33be1e3d622ec9f9a.tar.gz | |
* src/truetype/ttpload.c (tt_face_load_hdmx): Ignore `version'.
Problem reported by 張俊芝 <418092625@qq.com>.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/truetype/ttpload.c | 10 |
2 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2016-12-24 Werner Lemberg <wl@gnu.org> + * src/truetype/ttpload.c (tt_face_load_hdmx): Ignore `version'. + + Problem reported by 張俊芝 <418092625@qq.com>. + +2016-12-24 Werner Lemberg <wl@gnu.org> + * src/sfnt/ttsbit.c (tt_face_load_sbit): Allow more version values. Some fonts seem to have the `version' field in the wrong byte order. diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index 95ab47017..d756d3842 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -524,7 +524,7 @@ { FT_Error error; FT_Memory memory = stream->memory; - FT_UInt version, nn, num_records; + FT_UInt nn, num_records; FT_ULong table_size, record_size; FT_Byte* p; FT_Byte* limit; @@ -541,7 +541,10 @@ p = face->hdmx_table; limit = p + table_size; - version = FT_NEXT_USHORT( p ); + /* Given that `hdmx' tables are losing its importance (for example, */ + /* variation fonts introduced in OpenType 1.8 must not have this */ + /* table) we no longer test for a correct `version' field. */ + p += 2; num_records = FT_NEXT_USHORT( p ); record_size = FT_NEXT_ULONG( p ); @@ -560,8 +563,7 @@ record_size &= 0xFFFFU; /* The limit for `num_records' is a heuristic value. */ - if ( version != 0 || - num_records > 255 || + if ( num_records > 255 || ( num_records > 0 && ( record_size > 0x10001L || record_size < 4 ) ) ) |