From 2ab3ce7aaaa07c7a7a32bede4c2a981e4d8d1b15 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 12 Nov 2016 15:20:37 +0000 Subject: upmendex: Avoid access violation git-svn-id: svn://tug.org/texlive/trunk@42492 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/mendexk/ChangeLog | 2 +- Build/source/texk/upmendex/ChangeLog | 4 ++++ Build/source/texk/upmendex/main.c | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog index 8a0f1d4834f..d61595861b7 100644 --- a/Build/source/texk/mendexk/ChangeLog +++ b/Build/source/texk/mendexk/ChangeLog @@ -1,7 +1,7 @@ 2016-11-12 Akira Kakuto * mendex.h: Sync with W32TeX (W32 only). - * main.c: Avoid access violation on Windows. + * main.c: Avoid access violation. 2016-09-28 Hironobu Yamashita diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog index d3d014f1b07..2ee1fae89cf 100644 --- a/Build/source/texk/upmendex/ChangeLog +++ b/Build/source/texk/upmendex/ChangeLog @@ -1,3 +1,7 @@ +2016-11-12 TANAKA Takuji + + * main.c: Avoid access violation. + 2016-06-19 TANAKA Takuji * version 0.51 Beta version. diff --git a/Build/source/texk/upmendex/main.c b/Build/source/texk/upmendex/main.c index eb5a68db6e7..1a46b6a04d3 100644 --- a/Build/source/texk/upmendex/main.c +++ b/Build/source/texk/upmendex/main.c @@ -202,8 +202,6 @@ int main(int argc, char **argv) /* init hangul tumunja table */ u_strcpy(tumunja,GANADA); - if (styfile!=NULL) styread(styfile); - if (!indfile &&(idxcount-fsti>0)) { indfile=xmalloc(strlen(idxfile[0]+6)); for (i=strlen(idxfile[0]);i>=0;i--) { @@ -233,6 +231,9 @@ int main(int argc, char **argv) efp=stderr; logfile=xstrdup("stderr"); } + + if (styfile!=NULL) styread(styfile); + set_icu_attributes(); if (strcmp(argv[0],"makeindex")==0) { -- cgit v1.2.3