[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 577daf1: * src/pcf/pcfread.c (pcf_load_font): Fix int
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 577daf1: * src/pcf/pcfread.c (pcf_load_font): Fix integer overflow (#45964). |
Date: |
Tue, 15 Sep 2015 05:10:26 +0000 |
branch: master
commit 577daf1c306ebc479a50813efa7cd1c669a82d1a
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* src/pcf/pcfread.c (pcf_load_font): Fix integer overflow (#45964).
---
ChangeLog | 4 ++++
src/pcf/pcfread.c | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a69a1a4..bf71948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-09-15 Werner Lemberg <address@hidden>
+ * src/pcf/pcfread.c (pcf_load_font): Fix integer overflow (#45964).
+
+2015-09-15 Werner Lemberg <address@hidden>
+
[type1, type42] Check encoding array size (#45961).
* src/type1/t1load.c (parse_encoding), src/type42/t42parse.c
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 039af33..9da7e75 100644
--- 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 )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 577daf1: * src/pcf/pcfread.c (pcf_load_font): Fix integer overflow (#45964).,
Werner LEMBERG <=