texlive[43700] Build/source/texk: texk/{mendexk,upmendex}: Avoid

[commits+takuji at tug.org]

Revision: 43700
          http://tug.org/svn/texlive?view=revision&revision=43700
Author:   takuji
Date:     2017-04-05 15:27:44 +0200 (Wed, 05 Apr 2017)
Log Message:
-----------
texk/{mendexk,upmendex}: Avoid access violation

Modified Paths:
--------------
    trunk/Build/source/texk/mendexk/ChangeLog
    trunk/Build/source/texk/mendexk/main.c
    trunk/Build/source/texk/upmendex/COPYRIGHT
    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	2017-04-05 12:42:34 UTC (rev 43699)
+++ trunk/Build/source/texk/mendexk/ChangeLog	2017-04-05 13:27:44 UTC (rev 43700)
@@ -1,3 +1,8 @@
+2017-04-05  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* main.c: Avoid access violation.
+	Thanks to I. Wada san.
+
 2016-12-21  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* mendex.1, mendex.doc, mendex.1.ja: Sync with upstream.

Modified: trunk/Build/source/texk/mendexk/main.c
===================================================================
--- trunk/Build/source/texk/mendexk/main.c	2017-04-05 12:42:34 UTC (rev 43699)
+++ trunk/Build/source/texk/mendexk/main.c	2017-04-05 13:27:44 UTC (rev 43700)
@@ -254,7 +254,7 @@
 	}
 
 	if (!indfile &&(idxcount-fsti>0)) {
-		indfile=xmalloc(strlen(idxfile[0]+6));
+		indfile=xmalloc(strlen(idxfile[0])+6);
 		for (i=strlen(idxfile[0]);i>=0;i--) {
 			if (idxfile[0][i]=='.') {
 				strncpy(indfile,idxfile[0],i);
@@ -266,7 +266,7 @@
 	}
 
 	if (!logfile && (idxcount-fsti > 0)) {
-		logfile=xmalloc(strlen(idxfile[0]+6));
+		logfile=xmalloc(strlen(idxfile[0])+6);
 		for (i=strlen(idxfile[0]);i>=0;i--) {
 			if (idxfile[0][i]=='.') {
 				strncpy(logfile,idxfile[0],i);

Modified: trunk/Build/source/texk/upmendex/COPYRIGHT
===================================================================
--- trunk/Build/source/texk/upmendex/COPYRIGHT	2017-04-05 12:42:34 UTC (rev 43699)
+++ trunk/Build/source/texk/upmendex/COPYRIGHT	2017-04-05 13:27:44 UTC (rev 43700)
@@ -1,5 +1,5 @@
 Copyright (C) 1995 ASCII Corporation, 2009 ASCII MEDIA WORKS,
-              2015-2016 TANAKA Takuji
+              2015-2017 TANAKA Takuji
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: trunk/Build/source/texk/upmendex/ChangeLog
===================================================================
--- trunk/Build/source/texk/upmendex/ChangeLog	2017-04-05 12:42:34 UTC (rev 43699)
+++ trunk/Build/source/texk/upmendex/ChangeLog	2017-04-05 13:27:44 UTC (rev 43700)
@@ -1,3 +1,9 @@
+2017-04-05  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* main.c: Avoid access violation.
+	Thanks to I. Wada san.
+	* main.c, COPYRIGHT: Update copyright year.
+
 2016-12-24  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* sort.c: Add Cyrillic Extended-C

Modified: trunk/Build/source/texk/upmendex/main.c
===================================================================
--- trunk/Build/source/texk/upmendex/main.c	2017-04-05 12:42:34 UTC (rev 43699)
+++ trunk/Build/source/texk/upmendex/main.c	2017-04-05 13:27:44 UTC (rev 43700)
@@ -156,7 +156,7 @@
 				u_getVersion(icuVersion);
 				u_versionToString(icuVersion, icu_version);
 				fprintf(stderr,"upmendex - index processor, %s (%s).\n",VERSION, TL_VERSION);
-				fprintf(stderr," Copyright 2009 ASCII MEDIA WORKS, 2015-2016 TANAKA Takuji\n");
+				fprintf(stderr," Copyright 2009 ASCII MEDIA WORKS, 2015-2017 TANAKA Takuji\n");
 				fprintf(stderr," using ICU version %s\n",icu_version);
 				fprintf(stderr,"usage:\n");
 				fprintf(stderr,"%% upmendex [-ilqrcgf] [-s sty] [-d dic] [-o ind] [-t log] [-p no] [--] [idx0 idx1 ...]\n");
@@ -200,7 +200,7 @@
 	}
 
 	if (!indfile &&(idxcount-fsti>0)) {
-		indfile=xmalloc(strlen(idxfile[0]+6));
+		indfile=xmalloc(strlen(idxfile[0])+6);
 		for (i=strlen(idxfile[0]);i>=0;i--) {
 			if (idxfile[0][i]=='.') {
 				strncpy(indfile,idxfile[0],i);
@@ -212,7 +212,7 @@
 	}
 
 	if (!logfile && (idxcount-fsti > 0)) {
-		logfile=xmalloc(strlen(idxfile[0]+6));
+		logfile=xmalloc(strlen(idxfile[0])+6);
 		for (i=strlen(idxfile[0]);i>=0;i--) {
 			if (idxfile[0][i]=='.') {
 				strncpy(logfile,idxfile[0],i);