shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[base] Fix calls to `FT_Stream_Seek'.

* src/base/ftobjs.c (Mac_Read_sfnt_Resource, FT_Open_Face): Set
`error'.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,4 +1,11 @@

-2015-12-10  Ben Wagner <[email protected]>

+2015-12-14  Werner Lemberg  <[email protected]>

+

+	[base] Fix calls to `FT_Stream_Seek'.

+

+	* src/base/ftobjs.c (Mac_Read_sfnt_Resource, FT_Open_Face): Set

+	`error'.

+

+2015-12-14  Ben Wagner <[email protected]>

 	[base] Check error when seeking to data supplied offset (#46635).

--- a/src/base/ftobjs.c

+++ b/src/base/ftobjs.c

@@ -1803,7 +1803,8 @@

       goto Exit;

     /* rewind sfnt stream before open_face_PS_from_sfnt_stream() */

-    if ( FT_Stream_Seek( stream, flag_offset + 4 ) )

+    error = FT_Stream_Seek( stream, flag_offset + 4 );

+    if ( error )

       goto Exit;

     if ( FT_ALLOC( sfnt_data, rlen ) )

@@ -2184,7 +2185,8 @@

                FT_ERR_EQ( error, Table_Missing )                        )

           {

             /* TrueType but essential tables are missing */

-            if ( FT_Stream_Seek( stream, 0 ) )

+            error = FT_Stream_Seek( stream, 0 );

+            if ( error )

               break;

             error = open_face_PS_from_sfnt_stream( library,