AuroraMiddleware/freetype
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[winfonts] Fix Savannah bug #35659.

Browse Source 
* src/winfonts/winfnt.c (FNT_Face_Init): Check number of glyphs.
This commit is contained in:
Werner Lemberg 2012-03-01 16:11:33 +01:00
parent d9c1659610
commit 7d35a7dc7c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-01 Werner Lemberg <wl@gnu.org>
[winfonts] Fix Savannah bug #35659.
* src/winfonts/winfnt.c (FNT_Face_Init): Check number of glyphs.
2012-03-01 Werner Lemberg <wl@gnu.org>
[bdf] Fix Savannah bug #35658.

11
src/winfonts/winfnt.c
View File

@ -4,7 +4,7 @@
/* */
/* FreeType font driver for Windows FNT/FON files */
/* */
/* Copyright 1996-2004, 2006-2011 by */
/* Copyright 1996-2004, 2006-2012 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* Copyright 2003 Huw D M Davies for Codeweavers */
/* Copyright 2007 Dmitry Timoshkov for Codeweavers */
@ -831,7 +831,14 @@
root->charmap = root->charmaps[0];
}
/* setup remaining flags */
/* set up remaining flags */
if ( font->header.last_char < font->header.first_char )
{
FT_TRACE2(( "invalid number of glyphs\n" ));
error = FNT_Err_Invalid_File_Format;
goto Fail;
}
/* reserve one slot for the .notdef glyph at index 0 */
root->num_glyphs = font->header.last_char -