* src/bdf/bdflib.c (_bdf_parse_start): Disallow 0 bpp.

10 years ago · 41bfbadcd3
parent 4308b7b1af
commit 41bfbadcd3
2 changed files with 7 additions and 1 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2015-06-24  Alexei Podtelezhnikov <apodtele@gmail.com>
+
+	* src/bdf/bdflib.c (_bdf_parse_start): Disallow 0 bpp.
+
 2015-06-24  Alexei Podtelezhnikov <apodtele@gmail.com>

 	* src/bdf/bdflib.c (_bdf_parse_start): Simplify bpp parsing.
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@ -2356,8 +2356,10 @@
          p->font->bpp = 8;
        else if ( bpp > 2 )
          p->font->bpp = 4;
+        else if ( bpp > 1 )
+          p->font->bpp = 2;
        else
-          p->font->bpp = bpp;
+          p->font->bpp = 1;

        if ( p->font->bpp != bpp )
          FT_TRACE2(( "_bdf_parse_start: " ACMSG11, p->font->bpp ));