* src/pcf/pcfread.c (pcf_load_font): Fix integer overflow (#45964).

9 years ago · 577daf1c30
parent 581c7e2a51
commit 577daf1c30
2 changed files with 5 additions and 2 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2015-09-15  Werner Lemberg  <wl@gnu.org>
+
+	* src/pcf/pcfread.c (pcf_load_font): Fix integer overflow (#45964).
+
 2015-09-15  Werner Lemberg  <wl@gnu.org>

 	[type1, type42] Check encoding array size (#45961).
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@ -1287,8 +1287,7 @@ THE SOFTWARE.
        prop = pcf_find_property( face, "POINT_SIZE" );
        if ( prop )
          /* convert from 722.7 decipoints to 72 points per inch */
-          bsize->size =
-            (FT_Pos)( ( prop->value.l * 64 * 7200 + 36135L ) / 72270L );
+          bsize->size = FT_MulDiv( prop->value.l, 64 * 7200, 72270L );

        prop = pcf_find_property( face, "PIXEL_SIZE" );
        if ( prop )