diff options
| author | Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> | 2020-04-04 14:06:37 +0530 |
|---|---|---|
| committer | Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> | 2020-04-04 14:06:37 +0530 |
| commit | 7a019a63ed9753772e758beec3cad7c0b74ee2aa (patch) | |
| tree | 6597b334fb57c11b51cdae07355cf3601d730800 | |
| parent | 13c0df80dca59ce2ef3ec125b08c5b6ea485535c (diff) | |
| download | freetype2-7a019a63ed9753772e758beec3cad7c0b74ee2aa.tar.gz | |
[woff2] Return if single stream operation fails.
* src/sfnt/sfwoff2.c (get_x_mins): Do it.
* src/sfnt/woff2tags.c: Remove unused include.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/sfnt/sfwoff2.c | 6 | ||||
| -rw-r--r-- | src/sfnt/woff2tags.c | 1 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2020-04-04 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> + + [woff2] Return if single stream operation fails. + + * src/sfnt/sfwoff2.c (get_x_mins): Do it. + + * src/sfnt/woff2tags.c: Remove unused include. + 2020-03-22 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> [docs] Fix building docs if `srcdir' != `builddir'. diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c index fe3fbe8f6..1b99e7d28 100644 --- a/src/sfnt/sfwoff2.c +++ b/src/sfnt/sfwoff2.c @@ -1288,7 +1288,7 @@ } /* Read `numGlyphs' field from `maxp' table. */ - if ( FT_STREAM_SEEK( maxp_table->src_offset ) && FT_STREAM_SKIP( 8 ) ) + if ( FT_STREAM_SEEK( maxp_table->src_offset ) || FT_STREAM_SKIP( 8 ) ) return error; if ( FT_READ_USHORT( num_glyphs ) ) @@ -1297,7 +1297,7 @@ info->num_glyphs = num_glyphs; /* Read `indexToLocFormat' field from `head' table. */ - if ( FT_STREAM_SEEK( head_table->src_offset ) && + if ( FT_STREAM_SEEK( head_table->src_offset ) || FT_STREAM_SKIP( 50 ) ) return error; @@ -1335,7 +1335,7 @@ glyf_offset += info->glyf_table->src_offset; - if ( FT_STREAM_SEEK( glyf_offset ) && FT_STREAM_SKIP( 2 ) ) + if ( FT_STREAM_SEEK( glyf_offset ) || FT_STREAM_SKIP( 2 ) ) return error; if ( FT_READ_USHORT( info->x_mins[i] ) ) diff --git a/src/sfnt/woff2tags.c b/src/sfnt/woff2tags.c index 9034fc98d..246f7fa06 100644 --- a/src/sfnt/woff2tags.c +++ b/src/sfnt/woff2tags.c @@ -17,7 +17,6 @@ #include <ft2build.h> -#include "sfwoff.h" #include FT_TRUETYPE_TAGS_H |