From ff381f4af65f0f0d0fff5019bdc991fe047565c0 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 29 Jan 2019 04:08:26 +0000 Subject: forbid too long kanji option. git-svn-id: svn://tug.org/texlive/trunk@49860 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pmpostdir/ChangeLog | 1 + Build/source/texk/web2c/pmpostdir/pmpost.ch | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) (limited to 'Build/source') 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 * pmpost.ch: adapt to the new mpost.w. + Forbid too long kanji option. 2018-12-21 Karl Berry 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 -- cgit v1.2.3