From 9be385c94d63dd4951bb578a8417cf4a944ab827 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 22 Jul 2018 12:49:25 +0200 Subject: [PATCH] * src/pcf/pcfread.c (pcf_load_font): Fix number of glyphs. This is an oversight of the module change 2018-07-21. Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9524 --- ChangeLog | 10 ++++++++++ src/pcf/pcfread.c | 9 +-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 635a4014b..d442b40cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2018-07-22 Werner Lemberg + + * src/pcf/pcfread.c (pcf_load_font): Fix number of glyphs. + + This is an oversight of the module change 2018-07-21. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9524 + 2018-07-22 Werner Lemberg [cid] Sanitize `BlueShift' and `BlueFuzz'. diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 06a1a5ec4..e55b47290 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -1538,14 +1538,7 @@ THE SOFTWARE. else root->family_name = NULL; - /* - * Note: We shift all glyph indices by +1 since we must - * respect the convention that glyph 0 always corresponds - * to the `missing glyph'. - * - * This implies bumping the number of `available' glyphs by 1. - */ - root->num_glyphs = (FT_Long)( face->nmetrics + 1 ); + root->num_glyphs = (FT_Long)face->nmetrics; root->num_fixed_sizes = 1; if ( FT_NEW_ARRAY( root->available_sizes, 1 ) )