[texlive-bin] 01/04: svn42488 - 42493 avoid access violation in (up)mendex
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-bin.
commit f926d934bb0a0de94d83c8daf93cde61d0ffb4ef
Author: Norbert Preining <preining@debian.org>
Date: Sun Nov 13 22:03:02 2016 +0900
svn42488 - 42493 avoid access violation in (up)mendex
---
debian/changelog | 3 +-
debian/patches/series | 1 +
...m-svn42489-svn42493-mendex-fix-access-violation | 86 ++++++++++++++++++++++
3 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 8069afc..0366b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ texlive-bin (2016.20160513.41080-8~1) UNRELEASED; urgency=medium
- svn42381 use initstarttime in eptex
- svn42383 use -1 for invalid epoch (dvips)
- svn42391 use -1 for invalid epoch (dvipdfmx)
+ - svn42488 - 42493 avoid access violation in (up)mendex
- -- Norbert Preining <preining@debian.org> Mon, 31 Oct 2016 16:36:01 +0900
+ -- Norbert Preining <preining@debian.org> Sun, 13 Nov 2016 22:00:45 +0900
texlive-bin (2016.20160513.41080-7) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index e7ea019..25431ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@ upstream-svn42380-euptex-initstarttime
upstream-svn42381-eptex-initstarttime
upstream-svn42383-invalid-epoch
upstream-svn42391-invalid-epoch-dvipdfmx
+upstream-svn42489-svn42493-mendex-fix-access-violation
diff --git a/debian/patches/upstream-svn42489-svn42493-mendex-fix-access-violation b/debian/patches/upstream-svn42489-svn42493-mendex-fix-access-violation
new file mode 100644
index 0000000..171ef95
--- /dev/null
+++ b/debian/patches/upstream-svn42489-svn42493-mendex-fix-access-violation
@@ -0,0 +1,86 @@
+---
+ texk/mendexk/ChangeLog | 5 +++++
+ texk/mendexk/main.c | 4 ++--
+ texk/mendexk/mendex.h | 2 +-
+ texk/upmendex/ChangeLog | 4 ++++
+ texk/upmendex/main.c | 10 +++++-----
+ 5 files changed, 17 insertions(+), 8 deletions(-)
+
+--- texlive-bin.orig/texk/mendexk/ChangeLog
++++ texlive-bin/texk/mendexk/ChangeLog
+@@ -1,3 +1,8 @@
++2016-11-12 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
++
++ * mendex.h: Sync with W32TeX (W32 only).
++ * main.c: Avoid access violation.
++
+ 2016-09-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * styfile.c: Use mfgets() instead of fgets() in bfgets().
+--- texlive-bin.orig/texk/mendexk/main.c
++++ texlive-bin/texk/mendexk/main.c
+@@ -253,8 +253,6 @@
+ }
+ }
+
+- if (styfile!=NULL) styread(styfile);
+-
+ if (!indfile &&(idxcount-fsti>0)) {
+ indfile=xmalloc(strlen(idxfile[0]+6));
+ for (i=strlen(idxfile[0]);i>=0;i--) {
+@@ -285,6 +283,8 @@
+ logfile=xstrdup("stderr");
+ }
+
++ if (styfile!=NULL) styread(styfile);
++
+ if (strcmp(argv[0],"makeindex")==0) {
+ verb_printf(efp,"This is Not `MAKEINDEX\', But `MENDEX\' %s (%s) (%s).\n",
+ VERSION, get_enc_string(), TL_VERSION);
+--- texlive-bin.orig/texk/mendexk/mendex.h
++++ texlive-bin/texk/mendexk/mendex.h
+@@ -8,7 +8,7 @@
+
+ #ifdef WIN32
+ #define nkf_open fopen
+-#define nkf_close fclose
++#define nkf_close(fp) {clear_infile_enc(fp); fclose(fp);}
+ #endif
+
+ struct page {
+--- texlive-bin.orig/texk/upmendex/ChangeLog
++++ texlive-bin/texk/upmendex/ChangeLog
+@@ -1,3 +1,7 @@
++2016-11-12 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
++
++ * main.c: Avoid access violation.
++
+ 2016-06-19 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version 0.51 Beta version.
+--- texlive-bin.orig/texk/upmendex/main.c
++++ texlive-bin/texk/upmendex/main.c
+@@ -199,11 +199,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 +228,11 @@
+ efp=stderr;
+ logfile=xstrdup("stderr");
+ }
++
++/* init hangul tumunja table */
++ u_strcpy(tumunja,GANADA);
++ if (styfile!=NULL) styread(styfile);
++
+ set_icu_attributes();
+
+ if (strcmp(argv[0],"makeindex")==0) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: