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

[sfnt, winfonts] Avoid memory leaks in case of error (#56587). 

* src/sfnt/sfwoff.c (woff_open_font): Call `FT_FRAME_EXIT' in case
of error.

* src/winfonts/winfnt.c (fnt_face_get_dll_font): Ditto.
This commit is contained in:
Werner Lemberg 2019-07-12 11:36:12 +02:00
parent 12e4307dc7
commit b110acba9e
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2019-07-12 Werner Lemberg <wl@gnu.org>
[sfnt, winfonts] Avoid memory leaks in case of error (#56587).
* src/sfnt/sfwoff.c (woff_open_font): Call `FT_FRAME_EXIT' in case
of error.
* src/winfonts/winfnt.c (fnt_face_get_dll_font): Ditto.
2019-07-12 Ben Wagner <bungeman@google.com>
Properly handle phantom points for variation fonts (#56601).

10
src/sfnt/sfwoff.c
View File

@ -371,18 +371,18 @@
sfnt + table->OrigOffset, &output_len,
stream->cursor, table->CompLength );
if ( error )
goto Exit;
goto Exit1;
if ( output_len != table->OrigLength )
{
FT_ERROR(( "woff_font_open: compressed table length mismatch\n" ));
error = FT_THROW( Invalid_Table );
goto Exit;
goto Exit1;
}
#else /* !FT_CONFIG_OPTION_USE_ZLIB */
error = FT_THROW( Unimplemented_Feature );
goto Exit;
goto Exit1;
#endif /* !FT_CONFIG_OPTION_USE_ZLIB */
}
@ -424,6 +424,10 @@
}
return error;
Exit1:
FT_FRAME_EXIT();
goto Exit;
}

6
src/winfonts/winfnt.c
View File

@ -331,7 +331,7 @@
{
FT_TRACE2(( "invalid alignment shift count for resource data\n" ));
error = FT_THROW( Invalid_File_Format );
goto Exit;
goto Exit1;
}
@ -597,6 +597,10 @@
Exit:
return error;
Exit1:
FT_FRAME_EXIT();
goto Exit;
}