diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-06-02 09:16:52 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-06-02 09:16:52 +0200 |
| commit | 03b0cc2ea9b63f57ec58f77d8cc1350691d7140a (patch) | |
| tree | f3165c938b3238208b80263213a2df4cbfc109dd | |
| parent | 47a03e9b2366bba091bc21d011ab60782538243a (diff) | |
| download | freetype2-03b0cc2ea9b63f57ec58f77d8cc1350691d7140a.tar.gz | |
[bdf] Don't left-shift negative numbers.
Reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2031
* src/bdf/bdfdrivr.c (BDF_Face_Init): Use multiplication.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/bdf/bdfdrivr.c | 4 |
2 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,15 @@ 2017-06-02 Werner Lemberg <wl@gnu.org> + [bdf] Don't left-shift negative numbers. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2031 + + * src/bdf/bdfdrivr.c (BDF_Face_Init): Use multiplication. + +2017-06-02 Werner Lemberg <wl@gnu.org> + [bdf] Fix integer scanning routines. Reported as diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index c0a5a5c50..540d367c6 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -455,11 +455,11 @@ THE SOFTWARE. bsize->size = (FT_Pos)( ( prop->value.l * 64 * 7200 + 36135L ) / 72270L ); else - bsize->size = bsize->width << 6; + bsize->size = bsize->width * 64; prop = bdf_get_font_property( font, "PIXEL_SIZE" ); if ( prop ) - bsize->y_ppem = (FT_Short)prop->value.l << 6; + bsize->y_ppem = (FT_Short)prop->value.l * 64; prop = bdf_get_font_property( font, "RESOLUTION_X" ); if ( prop ) |