diff options
author | Werner Lemberg <wl@gnu.org> | 2018-11-09 12:14:35 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2018-11-09 12:14:35 +0100 |
commit | 58e48e92877f873248b84435e0c2350dab208bfa (patch) | |
tree | 9dd2ecd352d7e333d72aeeb07087f84bd878ca3d | |
parent | 3b6e65f7bf674601b9419d02ce0aa633e2e882fb (diff) | |
download | freetype2-58e48e92877f873248b84435e0c2350dab208bfa.tar.gz |
[psaux] Add safety guard (#54985).
* src/psaux/psobjs.c (cff_builder_close_contour): Do it.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/psaux/psobjs.c | 8 |
2 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2018-11-09 Young Xiao <yangx92@hotmail.com> + + [psaux] Add safety guard (#54985). + + * src/psaux/psobjs.c (cff_builder_close_contour): Do it. + 2018-11-08 Alexei Podtelezhnikov <apodtele@gmail.com> * 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 ) |