forked from minhngoc25a/freetype2
[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:
parent
0063649d54
commit
4099281f6e
|
@ -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).
|
[base] Check error when seeking to data supplied offset (#46635).
|
||||||
|
|
||||||
|
|
|
@ -1803,7 +1803,8 @@
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
/* rewind sfnt stream before open_face_PS_from_sfnt_stream() */
|
/* 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;
|
goto Exit;
|
||||||
|
|
||||||
if ( FT_ALLOC( sfnt_data, rlen ) )
|
if ( FT_ALLOC( sfnt_data, rlen ) )
|
||||||
|
@ -2184,7 +2185,8 @@
|
||||||
FT_ERR_EQ( error, Table_Missing ) )
|
FT_ERR_EQ( error, Table_Missing ) )
|
||||||
{
|
{
|
||||||
/* TrueType but essential tables are missing */
|
/* TrueType but essential tables are missing */
|
||||||
if ( FT_Stream_Seek( stream, 0 ) )
|
error = FT_Stream_Seek( stream, 0 );
|
||||||
|
if ( error )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
error = open_face_PS_from_sfnt_stream( library,
|
error = open_face_PS_from_sfnt_stream( library,
|
||||||
|
|
Loading…
Reference in New Issue