diff options
| author | Ben Wagner <bungeman@google.com> | 2018-03-23 06:13:25 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-03-23 06:13:25 +0100 |
| commit | 34e467332b0b5ecb03641540e715202204616139 (patch) | |
| tree | 1285a23512a7988589792f0a7a37ddd635595f5a | |
| parent | 43d4852ec6cfa1df126635ba65d65b22f12d3603 (diff) | |
| download | freetype2-34e467332b0b5ecb03641540e715202204616139.tar.gz | |
[sfnt] Correctly handle missing bitmaps in sbix format (#53404).
* src/sfnt/ttfsbit.c (tt_face_load_sbix_image): Fix return value.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/sfnt/ttsbit.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2018-03-23 Ben Wagner <bungeman@google.com> + [sfnt] Correctly handle missing bitmaps in sbix format (#53404). + + * src/sfnt/ttfsbit.c (tt_face_load_sbix_image): Fix return value. + +2018-03-23 Ben Wagner <bungeman@google.com> + [truetype] Fix advance of empty glyphs in bitmap fonts (#53393). * src/truetype/ttgload.c (TT_Load_Glyph): Apply scaling to metrics diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 53e61756d..33b8640bc 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -1514,7 +1514,7 @@ FT_FRAME_EXIT(); if ( glyph_start == glyph_end ) - return FT_THROW( Invalid_Argument ); + return FT_THROW( Missing_Bitmap ); if ( glyph_start > glyph_end || glyph_end - glyph_start < 8 || face->ebdt_size - strike_offset < glyph_end ) |