commit c4cad30ed1b1f554aa41a98b0b0fdca6e579e22f
author Werner Lemberg <wl@gnu.org> Thu Mar 08 20:11:37 2012 +0100
committer Werner Lemberg <wl@gnu.org> Thu Mar 08 20:11:37 2012 +0100
tree c7b37d71a35680d83ce5d1b6e75fede07374adc6
parent 26dfeb6d63940f1068cd482b7f506289eea5bafa

[bdf] Add missing overflow check.

* src/bdf/bdflib.c (_bdf_parse_glyphs) <BITMAP>: Add threshold for
`glyph->bpr'.

src/bdf/bdflib.c

diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 6a66d1d..b7b6857 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1912,7 +1912,7 @@
       glyph->bpr = ( glyph->bbx.width * p->font->bpp + 7 ) >> 3;
 
       bitmap_size = glyph->bpr * glyph->bbx.height;
-      if ( bitmap_size > 0xFFFFU )
+      if ( glyph->bpr > 0xFFFFU || bitmap_size > 0xFFFFU )
       {
         FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG4, lineno ));
         error = BDF_Err_Bbx_Too_Big;