diff options
author | Karl Berry <karl@freefriends.org> | 2023-08-26 22:16:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-08-26 22:16:10 +0000 |
commit | f2e621c9e3e8eb2f09d76331496983d5559c1ea3 (patch) | |
tree | 30235660b2f45a5f3089bb2831ae1ddd72491097 /Build/source/texk/dvipsk | |
parent | 26ce48249a1c46f68c68363624085ccd767bbc09 (diff) |
sync writet1.c fix to dvipsk and luatexdir
git-svn-id: svn://tug.org/texlive/trunk@68079 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk')
-rw-r--r-- | Build/source/texk/dvipsk/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/writet1.c | 17 |
2 files changed, 18 insertions, 4 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 53edb7b7165..6057b341395 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,8 @@ +2023-08-26 Karl Berry <karl@freefriends.org> + + * writet1.c (t1_builtin_enc): sync change from pdftexdir/writet1.c + (r68069). + 2023-08-11 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * beginfontk1.test, eepic-nan.test, pfbincl.test, same-name.test, diff --git a/Build/source/texk/dvipsk/writet1.c b/Build/source/texk/dvipsk/writet1.c index 0a95247196f..aa6d3eaecc7 100644 --- a/Build/source/texk/dvipsk/writet1.c +++ b/Build/source/texk/dvipsk/writet1.c @@ -1,5 +1,5 @@ /* -Copyright 1996-2018 Han The Thanh <thanh@pdftex.org> +Copyright 1996-2023 Han The Thanh <thanh@pdftex.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -769,7 +769,10 @@ static char **t1_builtin_enc(void) *t1_buf_array == '/' && valid_code(i)) { if (strcmp(t1_buf_array + 1, notdef) != 0) glyph_names[i] = xstrdup(t1_buf_array + 1); - p = strstr(p, " put") + strlen(" put"); + p = strstr(p, " put"); + if (!p) + pdftex_fail("invalid pfb, no put found in dup"); + p += strlen(" put"); skip(p, ' '); } /* @@ -778,7 +781,10 @@ static char **t1_builtin_enc(void) else if (sscanf(p, "dup dup %i exch %i get put", &b, &a) == 2 && valid_code(a) && valid_code(b)) { copy_glyph_names(glyph_names, a, b); - p = strstr(p, " get put") + strlen(" get put"); + p = strstr(p, " get put"); + if (!p) + pdftex_fail("invalid pfb, no get put found in dup dup"); + p += strlen(" get put"); skip(p, ' '); } /* @@ -789,7 +795,10 @@ static char **t1_builtin_enc(void) && valid_code(a) && valid_code(b) && valid_code(c)) { for (i = 0; i < c; i++) copy_glyph_names(glyph_names, a + i, b + i); - p = strstr(p, " putinterval") + strlen(" putinterval"); + p = strstr(p, " putinterval"); + if (!p) + pdftex_fail("invalid pfb, no putinterval found in dup dup"); + p += strlen(" putinterval"); skip(p, ' '); } /* |