[cff] Fix Savannah bug #41693.
* src/cff/cffload.c (CFF_Load_FD_Select): Reject empty array.
This commit is contained in:
parent
9a56764037
commit
08c628d128
|
@ -1,3 +1,9 @@
|
|||
2014-02-26 Wermer Lemberg <wl@gnu.org>
|
||||
|
||||
[cff] Fix Savannah bug #41693.
|
||||
|
||||
* src/cff/cffload.c (CFF_Load_FD_Select): Reject empty array.
|
||||
|
||||
2014-02-26 Wermer Lemberg <wl@gnu.org>
|
||||
|
||||
[bdf] Fix Savannah bug #41692.
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* OpenType and CFF data/program tables loader (body). */
|
||||
/* */
|
||||
/* Copyright 1996-2013 by */
|
||||
/* Copyright 1996-2014 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
@ -689,6 +689,13 @@
|
|||
if ( FT_READ_USHORT( num_ranges ) )
|
||||
goto Exit;
|
||||
|
||||
if ( !num_ranges )
|
||||
{
|
||||
FT_TRACE0(( "CFF_Load_FD_Select: empty FDSelect array\n" ));
|
||||
error = FT_THROW( Invalid_File_Format );
|
||||
goto Exit;
|
||||
}
|
||||
|
||||
fdselect->data_size = num_ranges * 3 + 2;
|
||||
|
||||
Load_Data:
|
||||
|
@ -719,7 +726,7 @@
|
|||
break;
|
||||
|
||||
case 3:
|
||||
/* first, compare to cache */
|
||||
/* first, compare to the cache */
|
||||
if ( (FT_UInt)( glyph_index - fdselect->cache_first ) <
|
||||
fdselect->cache_count )
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue