From ca3d679555c53de792ff2ff8dceb75cd9c2334d4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Jan 2021 22:48:04 +0000 Subject: omit iscntrl(), except for \r\n\t git-svn-id: svn://tug.org/texlive/trunk@57342 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/pdftexdir/ttf2afm.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 336be86ca81..d03504f67d6 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2021-01-06 Karl Berry + + * ttf2afm.c (make_name): let's exclude iscntrl() per Thanh, + but accept crlf and tab. + 2021-01-05 Karl Berry * ttf2afm.c (make_name): copy all characters, not just isprint(). diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c index 41b820ecf3b..e2158644e4f 100644 --- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c +++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c @@ -444,7 +444,9 @@ static char *make_name(long platform_id, int len) *p = get_char(); i++; } - p++; + /* don't copy strange characters */ + if (!iscntrl(*p) || *p == '\r' || *p == '\n' || *p == '\t') + p++; } *p = 0; return xstrdup(buf); -- cgit v1.2.3