texlive[42492] Build/source/texk: upmendex: Avoid access violation

[commits+takuji at tug.org]

Revision: 42492
          http://tug.org/svn/texlive?view=revision&revision=42492
Author:   takuji
Date:     2016-11-12 16:20:37 +0100 (Sat, 12 Nov 2016)
Log Message:
-----------
upmendex: Avoid access violation

Modified Paths:
--------------
    trunk/Build/source/texk/mendexk/ChangeLog
    trunk/Build/source/texk/upmendex/ChangeLog
    trunk/Build/source/texk/upmendex/main.c

Modified: trunk/Build/source/texk/mendexk/ChangeLog
===================================================================
--- trunk/Build/source/texk/mendexk/ChangeLog	2016-11-12 14:19:54 UTC (rev 42491)
+++ trunk/Build/source/texk/mendexk/ChangeLog	2016-11-12 15:20:37 UTC (rev 42492)
@@ -1,7 +1,7 @@
 2016-11-12  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* mendex.h: Sync with W32TeX (W32 only).
-	* main.c: Avoid access violation on Windows.
+	* main.c: Avoid access violation.
 
 2016-09-28  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
 

Modified: trunk/Build/source/texk/upmendex/ChangeLog
===================================================================
--- trunk/Build/source/texk/upmendex/ChangeLog	2016-11-12 14:19:54 UTC (rev 42491)
+++ trunk/Build/source/texk/upmendex/ChangeLog	2016-11-12 15:20:37 UTC (rev 42492)
@@ -1,3 +1,7 @@
+2016-11-12  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* main.c: Avoid access violation.
+
 2016-06-19  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* version 0.51  Beta version.

Modified: trunk/Build/source/texk/upmendex/main.c
===================================================================
--- trunk/Build/source/texk/upmendex/main.c	2016-11-12 14:19:54 UTC (rev 42491)
+++ trunk/Build/source/texk/upmendex/main.c	2016-11-12 15:20:37 UTC (rev 42492)
@@ -202,8 +202,6 @@
 /*   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 @@
 		efp=stderr;
 		logfile=xstrdup("stderr");
 	}
+
+	if (styfile!=NULL) styread(styfile);
+
 	set_icu_attributes();
 
 	if (strcmp(argv[0],"makeindex")==0) {