summaryrefslogtreecommitdiff
path: root/Build/source/texk/upmendex
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-05-19 08:04:08 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-05-19 08:04:08 +0000
commit00686ccb6d828b764f8c7822132a020f1a14519b (patch)
tree4cc842079567db88689ee6d683e250dc740d9b79 /Build/source/texk/upmendex
parent20a6dacdb8442b72101911b8d239350c799af1c8 (diff)
upmendex: ver.0.56, fix bug in reading style file
git-svn-id: svn://tug.org/texlive/trunk@59263 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/upmendex')
-rw-r--r--Build/source/texk/upmendex/ChangeLog9
-rwxr-xr-xBuild/source/texk/upmendex/configure22
-rw-r--r--Build/source/texk/upmendex/configure.ac2
-rw-r--r--Build/source/texk/upmendex/styfile.c11
4 files changed, 31 insertions, 13 deletions
diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog
index 9d59e2728d1..a907862a2bc 100644
--- a/Build/source/texk/upmendex/ChangeLog
+++ b/Build/source/texk/upmendex/ChangeLog
@@ -1,3 +1,12 @@
+2021-05-19 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version 0.56 Beta version.
+ * configure.ac: Bump version.
+ * styfile.c:
+ Fix a bug of reading keywords "setpage_prefix", "setpage_suffix"
+ in style file.
+ More strictly check string length.
+
2021-05-09 Karl Berry <karl@freefriends.org>
* mendex.h (page.attr): use int, not char, since we do signed
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure
index fe9cbfa3cb6..6c6ce883b03 100755
--- a/Build/source/texk/upmendex/configure
+++ b/Build/source/texk/upmendex/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for upmendex (TeX Live) 0.55.
+# Generated by GNU Autoconf 2.69 for upmendex (TeX Live) 0.56.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='upmendex (TeX Live)'
PACKAGE_TARNAME='upmendex--tex-live-'
-PACKAGE_VERSION='0.55'
-PACKAGE_STRING='upmendex (TeX Live) 0.55'
+PACKAGE_VERSION='0.56'
+PACKAGE_STRING='upmendex (TeX Live) 0.56'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures upmendex (TeX Live) 0.55 to adapt to many kinds of systems.
+\`configure' configures upmendex (TeX Live) 0.56 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1416,7 +1416,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of upmendex (TeX Live) 0.55:";;
+ short | recursive ) echo "Configuration of upmendex (TeX Live) 0.56:";;
esac
cat <<\_ACEOF
@@ -1541,7 +1541,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-upmendex (TeX Live) configure 0.55
+upmendex (TeX Live) configure 0.56
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2474,7 +2474,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by upmendex (TeX Live) $as_me 0.55, which was
+It was created by upmendex (TeX Live) $as_me 0.56, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8668,7 +8668,7 @@ fi
# Define the identity of the package.
PACKAGE='upmendex--tex-live-'
- VERSION='0.55'
+ VERSION='0.56'
# Some tools Automake needs.
@@ -18197,7 +18197,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-upmendex (TeX Live) config.lt 0.55
+upmendex (TeX Live) config.lt 0.56
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20337,7 +20337,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by upmendex (TeX Live) $as_me 0.55, which was
+This file was extended by upmendex (TeX Live) $as_me 0.56, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20403,7 +20403,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-upmendex (TeX Live) config.status 0.55
+upmendex (TeX Live) config.status 0.56
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/upmendex/configure.ac b/Build/source/texk/upmendex/configure.ac
index b3043309fad..f48f439160b 100644
--- a/Build/source/texk/upmendex/configure.ac
+++ b/Build/source/texk/upmendex/configure.ac
@@ -8,7 +8,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([upmendex (TeX Live)], [0.55])
+AC_INIT([upmendex (TeX Live)], [0.56])
AC_PREREQ([2.63])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/upmendex/styfile.c b/Build/source/texk/upmendex/styfile.c
index 1c94c900770..6091f61c46b 100644
--- a/Build/source/texk/upmendex/styfile.c
+++ b/Build/source/texk/upmendex/styfile.c
@@ -64,6 +64,8 @@ void styread(const char *filename)
if (getparachar(buff,"escape",&escape)) continue;
if (getparam(buff,"preamble",preamble)) continue;
if (getparam(buff,"postamble",postamble)) continue;
+ if (getparam(buff,"setpage_prefix",setpage_prefix)) continue;
+ if (getparam(buff,"setpage_suffix",setpage_suffix)) continue;
if (getparam(buff,"group_skip",group_skip)) continue;
if (getparam(buff,"lethead_prefix",lethead_prefix)) continue;
if (getparam(buff,"heading_prefix",lethead_prefix)) continue;
@@ -91,7 +93,6 @@ void styread(const char *filename)
if (getparam(buff,"item_0",item_0)) continue;
if (getparam(buff,"item_1",item_1)) continue;
if (getparam(buff,"item_2",item_2)) continue;
- if (getparam(buff,"item_2",item_2)) continue;
if (getparam(buff,"item_01",item_01)) continue;
if (getparam(buff,"item_x1",item_x1)) continue;
if (getparam(buff,"item_12",item_12)) continue;
@@ -164,6 +165,10 @@ static void convline(char *buff1, int start, char *buff2)
int i,j,cc;
for (i=start,j=cc=0;;i++) {
+ if (j==STYBUFSIZE-1) {
+ buff2[j]='\0';
+ break;
+ }
if (buff1[i]=='\"') {
if (cc==0) {
cc=1;
@@ -191,6 +196,10 @@ static void convline(char *buff1, int start, char *buff2)
verb_printf(efp,"\nWarning: Illegal input of lead byte 0x%x in UTF-8.", (unsigned char)buff1[i]);
continue;
}
+ else if (j+len>STYBUFSIZE-1) {
+ buff2[j]='\0';
+ break;
+ }
while(len--) {
buff2[j++]=buff1[i++];
}