From 58e48e92877f873248b84435e0c2350dab208bfa Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 9 Nov 2018 12:14:35 +0100 Subject: [PATCH] [psaux] Add safety guard (#54985). * src/psaux/psobjs.c (cff_builder_close_contour): Do it. --- ChangeLog | 6 ++++++ src/psaux/psobjs.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5d23322c1..3b7c47c1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-11-09 Young Xiao + + [psaux] Add safety guard (#54985). + + * src/psaux/psobjs.c (cff_builder_close_contour): Do it. + 2018-11-08 Alexei Podtelezhnikov * builds/unix/configure.raw: Require `windows.h' for windres. diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 906c00861..5c6b9b982 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -2042,6 +2042,14 @@ first = outline->n_contours <= 1 ? 0 : outline->contours[outline->n_contours - 2] + 1; + /* in malformed fonts it can happen that a contour was started */ + /* but no points were added */ + if ( outline->n_contours && first == outline->n_points ) + { + outline->n_contours--; + return; + } + /* We must not include the last point in the path if it */ /* is located on the first point. */ if ( outline->n_points > 1 )