Commit 7a019a63ed9753772e758beec3cad7c0b74ee2aa
2020-04-04T14:06:37
[woff2] Return if single stream operation fails. * src/sfnt/sfwoff2.c (get_x_mins): Do it. * src/sfnt/woff2tags.c: Remove unused include.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/ChangeLog b/ChangeLog
index 13d490c..a3a84ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 fe3fbe8..1b99e7d 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 9034fc9..246f7fa 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