From d4f9c249893a146b0c94a152f7674e288d181f95 Mon Sep 17 00:00:00 2001 From: John Stracke Date: Sat, 23 Nov 2019 11:25:28 +0100 Subject: [PATCH] [base] Really fix #57194. Apply accidentally missed second part of patch. * src/base/ftgloadr.c (FT_GlyphLoader_CheckPoints): Call `FT_GlyphLoader_CreateExtra'. --- ChangeLog | 9 +++++++++ src/base/ftgloadr.c | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index d5ef22e40..e5cb51c87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2019-11-23 John Stracke + + [base] Really fix #57194. + + Apply accidentally missed second part of patch. + + * src/base/ftgloadr.c (FT_GlyphLoader_CheckPoints): Call + `FT_GlyphLoader_CreateExtra'. + 2019-11-23 Werner Lemberg [truetype] Avoid sanitizer warning (#57289). diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index c076dcc34..4afb682f1 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -215,6 +215,10 @@ FT_UInt new_max, old_max; + error = FT_GlyphLoader_CreateExtra( loader ); + if ( error ) + return error; + /* check points & tags */ new_max = (FT_UInt)base->n_points + (FT_UInt)current->n_points + n_points; @@ -248,6 +252,10 @@ loader->max_points = new_max; } + error = FT_GlyphLoader_CreateExtra( loader ); + if ( error ) + return error; + /* check contours */ old_max = loader->max_contours; new_max = (FT_UInt)base->n_contours + (FT_UInt)current->n_contours +