summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-16 21:48:02 +0000
committerKarl Berry <karl@freefriends.org>2021-03-16 21:48:02 +0000
commitc8201b3e2e25ed926de8a2f47e5d11fce62dc9b5 (patch)
treee07d2e49cbb779a0a86f2a8e25603f6368c28669 /Build
parentbd9f3f5a375d6bf7cdab7ecfdde0e8e2a0ca9e69 (diff)
error message instead of assertion
git-svn-id: svn://tug.org/texlive/trunk@58431 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writefont.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index b7423541d95..91250e3fb29 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-16 Karl Berry <karl@freefriends.org>
+
+ * writefont.c (write_fontdictionary): pdftex_fail with message
+ instead of assertion. From Martin Budaj, Mar 16, 2021 at 8:47 AM.
+
2021-02-22 Phelype Oleinik <phe.h.o1@gmail.com>
* pdftex.web: avoid "expansion depth" overflow with \numexpr.
diff --git a/Build/source/texk/web2c/pdftexdir/writefont.c b/Build/source/texk/web2c/pdftexdir/writefont.c
index ec073e0edff..5f67a348bae 100644
--- a/Build/source/texk/web2c/pdftexdir/writefont.c
+++ b/Build/source/texk/web2c/pdftexdir/writefont.c
@@ -1,5 +1,5 @@
/* writefont.c: font descriptors and writing Type 1 fonts.
-Copyright 1996-2018 Han The Thanh, <thanh@pdftex.org>
+Copyright 1996-2021 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -552,7 +552,9 @@ static void write_fontdictionary(fo_entry * fo)
fo->tounicode_objnum =
write_tounicode(fo->fe->glyph_names, fo->fm->tfm_name, fo->fe->name);
} else if (is_type1(fo->fm)) {
- assert(fo->fd->builtin_glyph_names != NULL);
+ if (fo->fd->builtin_glyph_names==NULL) {
+ pdftex_fail("builtin glyph names is empty");
+ }
fo->tounicode_objnum =
write_tounicode(fo->fd->builtin_glyph_names, fo->fm->tfm_name, NULL);
}