summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTakuji Tanaka <KXD02663@nifty.ne.jp>2017-04-05 13:27:44 +0000
committerTakuji Tanaka <KXD02663@nifty.ne.jp>2017-04-05 13:27:44 +0000
commit2c218f95a536983eef84a1ad7da85c30498b934f (patch)
treea2d1a2b137cee2b955813f6d7db3a2bc3ab19868 /Build
parent0c220aa523a9baaa8e59714dd361b50a611a8706 (diff)
texk/{mendexk,upmendex}: Avoid access violation
git-svn-id: svn://tug.org/texlive/trunk@43700 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/mendexk/ChangeLog5
-rw-r--r--Build/source/texk/mendexk/main.c4
-rw-r--r--Build/source/texk/upmendex/COPYRIGHT2
-rw-r--r--Build/source/texk/upmendex/ChangeLog6
-rw-r--r--Build/source/texk/upmendex/main.c6
5 files changed, 17 insertions, 6 deletions
diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog
index 40577d504f0..f66cdc4e375 100644
--- a/Build/source/texk/mendexk/ChangeLog
+++ b/Build/source/texk/mendexk/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-05 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * main.c: Avoid access violation.
+ Thanks to I. Wada san.
+
2016-12-21 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* mendex.1, mendex.doc, mendex.1.ja: Sync with upstream.
diff --git a/Build/source/texk/mendexk/main.c b/Build/source/texk/mendexk/main.c
index 78ea3282fb0..35c75b01528 100644
--- a/Build/source/texk/mendexk/main.c
+++ b/Build/source/texk/mendexk/main.c
@@ -254,7 +254,7 @@ int main(int argc, char **argv)
}
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 @@ int main(int argc, char **argv)
}
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);
diff --git a/Build/source/texk/upmendex/COPYRIGHT b/Build/source/texk/upmendex/COPYRIGHT
index 133b89b56e9..71d21b0a15d 100644
--- a/Build/source/texk/upmendex/COPYRIGHT
+++ b/Build/source/texk/upmendex/COPYRIGHT
@@ -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
diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog
index bb54e75e17c..2923c0dc870 100644
--- a/Build/source/texk/upmendex/ChangeLog
+++ b/Build/source/texk/upmendex/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-05 TANAKA Takuji <ttk@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@t-lab.opal.ne.jp>
* sort.c: Add Cyrillic Extended-C
diff --git a/Build/source/texk/upmendex/main.c b/Build/source/texk/upmendex/main.c
index 5e505da9ae6..00983d863ff 100644
--- a/Build/source/texk/upmendex/main.c
+++ b/Build/source/texk/upmendex/main.c
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
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 @@ int main(int argc, char **argv)
}
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 @@ int main(int argc, char **argv)
}
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);