Bug 577952 – Error loading {GDEF,GSUB,GPOS} table 0x6EAD
Detect TrueType Collections by checking the font data header instead
of checking for "face->num_faces >1".
diff --git a/src/harfbuzz-stream.c b/src/harfbuzz-stream.c
index a3c3ab5..6d35479 100644
--- a/src/harfbuzz-stream.c
+++ b/src/harfbuzz-stream.c
@@ -167,7 +167,7 @@
{
HB_Stream stream = font->stream;
- HB_UInt offset = 0;
+ HB_UInt offset = 0, sig;
HB_UInt count, nn;
HB_Error error;
@@ -190,7 +190,14 @@
* FreeType's built-in data structures
*/
- if ( font->num_faces > 1 )
+ if ( FILE_Seek( 0 ) || ACCESS_Frame( 4 ) )
+ goto Exit;
+
+ sig = GET_Tag4();
+
+ FORGET_Frame();
+
+ if ( sig == HB_MAKE_TAG( 't', 't', 'c', 'f' ) )
{
/* deal with TrueType collections */
LOG(( ">> This is a TrueType Collection\n" ));