* src/truetype/ttgload.c (load_truetype_glyph): Fix test for invalid
glyph header.
This commit is contained in:
parent
c2e97a3072
commit
aef3fc816b
|
@ -1,3 +1,8 @@
|
|||
2001-12-17 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* src/truetype/ttgload.c (load_truetype_glyph): Fix test for invalid
|
||||
glyph header.
|
||||
|
||||
2001-12-15 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Remove compiler warning.
|
||||
|
|
|
@ -1873,6 +1873,7 @@
|
|||
return result;
|
||||
}
|
||||
|
||||
|
||||
/* documentation is in freetype.h */
|
||||
|
||||
FT_EXPORT_DEF( FT_Error )
|
||||
|
|
|
@ -723,16 +723,6 @@
|
|||
if ( index < (FT_UInt)face->num_locations - 1 )
|
||||
count = face->glyph_locations[index + 1] - offset;
|
||||
|
||||
/* temporary hack */
|
||||
#if 1
|
||||
if ( count < 10 )
|
||||
{
|
||||
/* This glyph is corrupted -- it does not have a complete header */
|
||||
error = TT_Err_Invalid_Outline;
|
||||
goto Fail;
|
||||
}
|
||||
#endif
|
||||
|
||||
if ( count == 0 )
|
||||
{
|
||||
/* as described by Frederic Loyer, these are spaces, and */
|
||||
|
@ -759,6 +749,16 @@
|
|||
goto Exit;
|
||||
}
|
||||
|
||||
/* temporary hack */
|
||||
#if 1
|
||||
if ( count < 10 )
|
||||
{
|
||||
/* This glyph is corrupted -- it does not have a complete header */
|
||||
error = TT_Err_Invalid_Outline;
|
||||
goto Fail;
|
||||
}
|
||||
#endif
|
||||
|
||||
offset = loader->glyf_offset + offset;
|
||||
|
||||
/* access glyph frame */
|
||||
|
|
Loading…
Reference in New Issue