diff options
author | Karl Berry <karl@freefriends.org> | 2023-08-26 17:50:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-08-26 17:50:10 +0000 |
commit | 5c5b96574dcf42cfc804a18863e8b1682e6095db (patch) | |
tree | 8109170b2b3d56c2f067d4ca0bb0fef4c3b6a684 /Build/source/texk/web2c/pdftexdir | |
parent | ea506310d7877e38fb32e2ab19c5249c5740c24b (diff) |
guard against corrupt pfb in dup tests, pdftex r910
git-svn-id: svn://tug.org/texlive/trunk@68069 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir')
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/writet1.c | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 446d89a5f20..f882df72433 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,9 @@ +2023-08-26 Karl Berry <karl@freefriends.org> + + * writet1.c (t1_builtin_enc): guard somewhat against corrupt pfbs, + in the dup and dup dup checking. Report from Gregory DUCK, + https://tug.org/pipermail/tex-live/2023-August/049400.html. + 2023-08-20 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * {expanded,pdfimage,pdftex,pdftosrc,ttf2afm,wcfname, diff --git a/Build/source/texk/web2c/pdftexdir/writet1.c b/Build/source/texk/web2c/pdftexdir/writet1.c index 0444d46be07..f2a8386cab5 100644 --- a/Build/source/texk/web2c/pdftexdir/writet1.c +++ b/Build/source/texk/web2c/pdftexdir/writet1.c @@ -841,7 +841,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, ' '); } /* @@ -850,7 +853,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, ' '); } /* @@ -861,7 +867,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, ' '); } /* |