mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some potential out-of-memory crashes.

Browse Source 
* src/base/ftobjs.c (ft_glyphslot_done): Check `slot->internal'.
* src/base/ftstream.c (FT_Stream_ReleaseFrame): Check `stream'.
* src/truetype/ttinterp.c (TT_New_Context): Avoid double-free of
`exec' in case of failure.
This commit is contained in:
Werner Lemberg 2009-06-07 13:09:21 +02:00
parent 2f2b780e00
commit c6788a389d
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-06-07 Harald Fernengel <harry@kdevelop.org>
Fix some potential out-of-memory crashes.
* src/base/ftobjs.c (ft_glyphslot_done): Check `slot->internal'.
* src/base/ftstream.c (FT_Stream_ReleaseFrame): Check `stream'.
* src/truetype/ttinterp.c (TT_New_Context): Avoid double-free of
`exec' in case of failure.
2009-06-07 Werner Lemberg <wl@gnu.org>
Simplify math.

16
src/base/ftobjs.c
View File

@ -348,14 +348,18 @@
/* free bitmap buffer if needed */
ft_glyphslot_free_bitmap( slot );
/* free glyph loader */
if ( FT_DRIVER_USES_OUTLINES( driver ) )
/* slot->internal might be NULL in out-of-memory situations */
if ( slot->internal )
{
FT_GlyphLoader_Done( slot->internal->loader );
slot->internal->loader = 0;
}
/* free glyph loader */
if ( FT_DRIVER_USES_OUTLINES( driver ) )
{
FT_GlyphLoader_Done( slot->internal->loader );
slot->internal->loader = 0;
}
FT_FREE( slot->internal );
FT_FREE( slot->internal );
}
}

4
src/base/ftstream.c
View File

@ -4,7 +4,7 @@
/* */
/* I/O stream support (body). */
/* */
/* Copyright 2000-2001, 2002, 2004, 2005, 2006, 2008 by */
/* Copyright 2000-2001, 2002, 2004, 2005, 2006, 2008, 2009 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -211,7 +211,7 @@
FT_Stream_ReleaseFrame( FT_Stream stream,
FT_Byte** pbytes )
{
if ( stream->read )
if ( stream && stream->read )
{
FT_Memory memory = stream->memory;

9
src/truetype/ttinterp.c
View File

@ -791,9 +791,9 @@
/* allocate object */
if ( FT_NEW( exec ) )
goto Exit;
goto Fail;
/* initialize it */
/* initialize it; in case of error this deallocates `exec' too */
error = Init_Context( exec, memory );
if ( error )
goto Fail;
@ -802,13 +802,10 @@
driver->context = exec;
}
Exit:
return driver->context;
Fail:
FT_FREE( exec );
return 0;
return NULL;
}