summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-06 04:03:32 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-06 04:03:32 +0000
commit2a2875399f7ab4c6582895196ace745e4e770359 (patch)
treeb002fd812e035d16f6ee65f102a5d32cd851affa
parent5c351ab7c7c2b01520708b44b544af76ca4f501a (diff)
texk/dvipdfm-x: Avoid to crash for unsupported native type1 fonts
git-svn-id: svn://tug.org/texlive/trunk@39283 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfm-x/t1_load.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index aa9a1a97ba4..9126007e6cd 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * t1_load.c: Avoid to crash for unsupported type1 fonts as native fonts.
+
2016-01-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* dvi.c: Symplify support of native type1 fonts in XeTeX.
diff --git a/Build/source/texk/dvipdfm-x/t1_load.c b/Build/source/texk/dvipdfm-x/t1_load.c
index 8111cfbb6e5..91a022d2fce 100644
--- a/Build/source/texk/dvipdfm-x/t1_load.c
+++ b/Build/source/texk/dvipdfm-x/t1_load.c
@@ -498,7 +498,12 @@ parse_encoding (char **enc_vec, unsigned char **start, unsigned char *end)
*/
tok = pst_get_token(start, end);
if (MATCH_OP(tok, "dup")) { /* possibly putinterval type */
- try_put_or_putinterval(enc_vec, start, end);
+ if (enc_vec == NULL) {
+ WARN ("This kind of type1 fonts are not supported as native fonts.\n"
+ " They are supported if used with tfm fonts.\n");
+ } else {
+ try_put_or_putinterval(enc_vec, start, end);
+ }
RELEASE_TOK(tok)
continue;
} else if (!tok || !PST_INTEGERTYPE(tok) ||