diff options
Diffstat (limited to 'src/base/ftobjs.c')
| -rw-r--r-- | src/base/ftobjs.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 7dcc7db58..cd20f374f 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -2544,7 +2544,7 @@ /* test for valid `library' delayed to `FT_Stream_New' */ - if ( ( !aface && face_index >= 0 ) || !args ) + if ( !args ) return FT_THROW( Invalid_Argument ); external_stream = FT_BOOL( ( args->flags & FT_OPEN_STREAM ) && @@ -2555,6 +2555,14 @@ if ( error ) goto Fail3; + /* Do this error check after `FT_Stream_New` to ensure that the */ + /* 'close' callback is called. */ + if ( !aface && face_index >= 0 ) + { + error = FT_THROW( Invalid_Argument ); + goto Fail3; + } + memory = library->memory; /* If the font driver is specified in the `args' structure, use */ |