diff options
author | Dominik Röttsches <drott@chromium.org> | 2020-02-25 11:08:11 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2020-02-25 11:02:28 +0100 |
commit | 5b1a37af563349172230842fcfdb59b5f22afcd0 (patch) | |
tree | 0debf6dbeaa09f6a28b4e560a89443ebe89380e8 | |
parent | fa147af4a5255bf9017c9b004f7abd1d5e72f497 (diff) | |
download | freetype2-5b1a37af563349172230842fcfdb59b5f22afcd0.tar.gz |
Fix for CFF space glyph regression (#57541).
* src/psaux/psft.c (cf2_decoder_parse_substrings): Replace early-out
with FT_OFFSET.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/psaux/psft.c | 5 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2020-02-25 Dominik Röttsches <drott@chromium.org> + + Fix for CFF space glyph regression (#57541). + + * src/psaux/psft.c (cf2_decoder_parse_substrings): Replace early-out + with FT_OFFSET. + 2020-02-22 Werner Lemberg <wl@gnu.org> [woff2] Fix font table access. diff --git a/src/psaux/psft.c b/src/psaux/psft.c index 08dd33c84..50b40bf8f 100644 --- a/src/psaux/psft.c +++ b/src/psaux/psft.c @@ -316,9 +316,6 @@ FT_Bool is_t1 = decoder->builder.is_t1; - if ( !charstring_base || !charstring_len ) - return FT_ERR( Invalid_File_Format ); - FT_ASSERT( decoder && ( is_t1 || decoder->cff ) ); @@ -388,7 +385,7 @@ FT_ZERO( &buf ); buf.start = buf.ptr = charstring_base; - buf.end = charstring_base + charstring_len; + buf.end = FT_OFFSET( charstring_base, charstring_len ); FT_ZERO( &transform ); |