| Revision: | 1.1 |
| Committed: | Wed Apr 4 15:43:38 2012 UTC (13 months, 2 weeks ago) by kkofler |
| Branch: | MAIN |
| CVS Tags: | freetype-freeworld-2_4_4-7_fc15, HEAD |
| Log Message: | * Wed Apr 04 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.4.4-7 - Add security patches from Fedora freetype-2.4.4-8 (rh#806270) |
| Line | User | Rev | File contents |
|---|---|---|---|
| 1 | kkofler | 1.1 | --- a/src/bdf/bdflib.c |
| 2 | +++ b/src/bdf/bdflib.c | ||
| 3 | @@ -1912,7 +1912,7 @@ | ||
| 4 | glyph->bpr = ( glyph->bbx.width * p->font->bpp + 7 ) >> 3; | ||
| 5 | |||
| 6 | bitmap_size = glyph->bpr * glyph->bbx.height; | ||
| 7 | - if ( bitmap_size > 0xFFFFU ) | ||
| 8 | + if ( glyph->bpr > 0xFFFFU || bitmap_size > 0xFFFFU ) | ||
| 9 | { | ||
| 10 | FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG4, lineno )); | ||
| 11 | error = BDF_Err_Bbx_Too_Big; |