summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-01-29 04:08:26 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-01-29 04:08:26 +0000
commitff381f4af65f0f0d0fff5019bdc991fe047565c0 (patch)
treee1a9d3fd6d383c2bcff3ebe40037791c1ffd0d6a /Build
parent0d950900efba21b41c4ba34ad5f74f9ca85deb81 (diff)
forbid too long kanji option.
git-svn-id: svn://tug.org/texlive/trunk@49860 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/pmpostdir/ChangeLog1
-rw-r--r--Build/source/texk/web2c/pmpostdir/pmpost.ch22
2 files changed, 17 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/pmpostdir/ChangeLog b/Build/source/texk/web2c/pmpostdir/ChangeLog
index 40d4f765d44..5f9af5660ba 100644
--- a/Build/source/texk/web2c/pmpostdir/ChangeLog
+++ b/Build/source/texk/web2c/pmpostdir/ChangeLog
@@ -1,6 +1,7 @@
2019-01-29 Akira Kakuto <kakuto@w32tex.org>
* pmpost.ch: adapt to the new mpost.w.
+ Forbid too long kanji option.
2018-12-21 Karl Berry <karl@freefriends.org>
diff --git a/Build/source/texk/web2c/pmpostdir/pmpost.ch b/Build/source/texk/web2c/pmpostdir/pmpost.ch
index d467528b031..effaa112b18 100644
--- a/Build/source/texk/web2c/pmpostdir/pmpost.ch
+++ b/Build/source/texk/web2c/pmpostdir/pmpost.ch
@@ -98,9 +98,14 @@ char kanjioption[16];
} else if (ARGUMENT_IS ("interaction")) {
@y
} else if (ARGUMENT_IS ("kanji")) {
- strcpy(kanjioption, optarg);
- if(!set_enc_string(optarg, optarg)) {
- fprintf(stderr,"Ignoring unknown argument `%s' to --kanji", optarg);
+ if (optarg) {
+ if (strlen(optarg) > 15) {
+ optarg[15] = '\0';
+ }
+ strcpy(kanjioption, optarg);
+ if (!set_enc_string(optarg, optarg)) {
+ fprintf(stderr,"Ignoring unknown argument `%s' to --kanji", optarg);
+ }
}
} else if (ARGUMENT_IS ("interaction")) {
@@ -120,9 +125,14 @@ char kanjioption[16];
} else if (option_is ("progname")) {
user_progname = optarg;
} else if (option_is ("kanji")) {
- strcpy (kanjioption, optarg);
- if(!set_enc_string(optarg, optarg)) {
- fprintf(stderr,"Ignoring unknown argument `%s' to --kanji", optarg);
+ if (optarg) {
+ if (strlen(optarg) > 15) {
+ optarg[15] = '\0';
+ }
+ strcpy (kanjioption, optarg);
+ if (!set_enc_string(optarg, optarg)) {
+ fprintf(stderr,"Ignoring unknown argument `%s' to --kanji", optarg);
+ }
}
@z