minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Apply patch #7196. 

* src/cff/cffgload.c (cff_slot_load): Prevent crash if CFF subfont
index is out of range.
This commit is contained in:
Hongbo Ni 2010-05-18 11:00:39 +02:00 committed by Werner Lemberg
parent 4c66924440
commit 236fc8e15a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2010-05-18 Hongbo Ni <hongbo@njstar.com>
Apply patch #7196.
* src/cff/cffgload.c (cff_slot_load): Prevent crash if CFF subfont
index is out of range.
2010-05-11 Werner Lemberg <wl@gnu.org>
* docs/formats.txt: Give pointer to PCF documentation.

12
src/cff/cffgload.c
View File

@ -2667,11 +2667,15 @@
/* this scaling is only relevant if the PS hinter isn't active */
if ( cff->num_subfonts )
{
FT_Byte fd_index = cff_fd_select_get( &cff->fd_select,
glyph_index );
FT_ULong top_upm, sub_upm;
FT_Byte fd_index = cff_fd_select_get( &cff->fd_select,
glyph_index );
FT_ULong top_upm = cff->top_font.font_dict.units_per_em;
FT_ULong sub_upm = cff->subfonts[fd_index]->font_dict.units_per_em;
if ( fd_index >= cff->num_subfonts )
fd_index = cff->num_subfonts - 1;
top_upm = cff->top_font.font_dict.units_per_em;
sub_upm = cff->subfonts[fd_index]->font_dict.units_per_em;
font_matrix = cff->subfonts[fd_index]->font_dict.font_matrix;