rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[base] Fix calls to `FT_Stream_Seek'. 

* src/base/ftobjs.c (Mac_Read_sfnt_Resource, FT_Open_Face): Set
`error'.
This commit is contained in:
Werner Lemberg 2015-12-14 07:51:25 +01:00
parent 0063649d54
commit 4099281f6e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,4 +1,11 @@
2015-12-10 Ben Wagner <bungeman@gmail.com>
2015-12-14 Werner Lemberg <wl@gnu.org>
[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 <bungeman@gmail.com>
[base] Check error when seeking to data supplied offset (#46635).

6
src/base/ftobjs.c
View File

@ -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,