texlive[71116] Build/source/texk/dvipdfm-x: dvipdfm-x: Fix segfaults
commits+takuji at tug.org
commits+takuji at tug.org
Mon Apr 29 09:41:24 CEST 2024
Revision: 71116
https://tug.org/svn/texlive?view=revision&revision=71116
Author: takuji
Date: 2024-04-29 09:41:24 +0200 (Mon, 29 Apr 2024)
Log Message:
-----------
dvipdfm-x: Fix segfaults
Modified Paths:
--------------
trunk/Build/source/texk/dvipdfm-x/ChangeLog
trunk/Build/source/texk/dvipdfm-x/configure
trunk/Build/source/texk/dvipdfm-x/configure.ac
trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test
trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-H
trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-V
trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map
trunk/Build/source/texk/dvipdfm-x/tfm.c
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2024-04-29 07:41:24 UTC (rev 71116)
@@ -1,3 +1,11 @@
+2024-04-29 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * tfm.c: Fix segfaults.
+ * dvipdfmx-upjf2.test, tests/UPJF-UTF16-{H,V},
+ tests/upjf-hara.map: Update tests.
+ https://github.com/texjporg/tex-jp-build/issues/46
+ * configure.ac: version 20240427.
+
2024-04-27 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* tfm.{c,h}, vf.c: Support upTeX new encoding
Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/configure 2024-04-29 07:41:24 UTC (rev 71116)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240427.
+# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240429.
#
# Report bugs to <dvipdfmx at tug.org>.
#
@@ -614,8 +614,8 @@
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20240427'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20240427'
+PACKAGE_VERSION='20240429'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20240429'
PACKAGE_BUGREPORT='dvipdfmx at tug.org'
PACKAGE_URL=''
@@ -1383,7 +1383,7 @@
# 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 dvipdfm-x (TeX Live) 20240427 to adapt to many kinds of systems.
+'configure' configures dvipdfm-x (TeX Live) 20240429 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1455,7 +1455,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240427:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240429:";;
esac
cat <<\_ACEOF
@@ -1586,7 +1586,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvipdfm-x (TeX Live) configure 20240427
+dvipdfm-x (TeX Live) configure 20240429
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2367,7 +2367,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvipdfm-x (TeX Live) $as_me 20240427, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20240429, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -9080,7 +9080,7 @@
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20240427'
+ VERSION='20240429'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -16159,7 +16159,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20240427
+dvipdfm-x (TeX Live) config.lt 20240429
configured by $0, generated by GNU Autoconf 2.72.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -18102,7 +18102,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvipdfm-x (TeX Live) $as_me 20240427, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20240429, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18174,7 +18174,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-dvipdfm-x (TeX Live) config.status 20240427
+dvipdfm-x (TeX Live) config.status 20240429
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/dvipdfm-x/configure.ac
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure.ac 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac 2024-04-29 07:41:24 UTC (rev 71116)
@@ -8,7 +8,7 @@
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([dvipdfm-x (TeX Live)], [20240427], [dvipdfmx at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20240429], [dvipdfmx at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
Modified: trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test 2024-04-29 07:41:24 UTC (rev 71116)
@@ -28,7 +28,7 @@
OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'`
export OPENTYPEFONTS
-rm -f upjf.vf upjv.vf
+rm -f upjf.vf upjv.vf upjf-r.ofm upjv-r.ofm
echo "*** dvipdfmx: test for upjf2_full-hara.pdf" && echo \
&& cp $srcdir/tests/upjf2_full.vf ./upjf.vf \
Modified: trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-H
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-H 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-H 2024-04-29 07:41:24 UTC (rev 71116)
@@ -39,10 +39,14 @@
<0000> <001f> 1
endnotdefrange
-3 begincidchar
+7 begincidchar
+<31f7> 16243
+<537f> 1698
<6674> 2646
<96ea> 2695
+<ff0c> 636
<d842df9f> 13803
+<d87edc33> 13719
endcidchar
14 begincidrange
Modified: trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-V
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-V 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-V 2024-04-29 07:41:24 UTC (rev 71116)
@@ -39,10 +39,14 @@
<0000> <001f> 1
endnotdefrange
-3 begincidchar
+7 begincidchar
+<31f7> 16340
+<537f> 1698
<6674> 2646
<96ea> 2695
+<ff0c> 8268
<d842df9f> 13803
+<d87edc33> 13719
endcidchar
14 begincidrange
Modified: trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map 2024-04-29 07:41:24 UTC (rev 71116)
@@ -1,8 +1,8 @@
-upjf-r UniJIS-UTF16-H HaranoAjiMincho-Regular.otf
-upjf-g UniJIS-UTF16-H HaranoAjiGothic-Regular.otf
+upjf-r UPJF-UTF16-H HaranoAjiMincho-Regular.otf
+upjf-g UPJF-UTF16-H HaranoAjiGothic-Regular.otf
upjf-c Identity-H HaranoAjiMincho-Regular.otf
-upjv-r UniJIS-UTF16-V HaranoAjiMincho-Regular.otf
-upjv-g UniJIS-UTF16-V HaranoAjiGothic-Regular.otf
+upjv-r UPJF-UTF16-V HaranoAjiMincho-Regular.otf
+upjv-g UPJF-UTF16-V HaranoAjiGothic-Regular.otf
upjv-c Identity-V HaranoAjiMincho-Regular.otf
%upjf-r UniJIS-UTF16-H !Ryumin-Light
Modified: trunk/Build/source/texk/dvipdfm-x/tfm.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tfm.c 2024-04-28 23:41:29 UTC (rev 71115)
+++ trunk/Build/source/texk/dvipdfm-x/tfm.c 2024-04-29 07:41:24 UTC (rev 71116)
@@ -1030,6 +1030,10 @@
default:
idx = ch;
}
+#ifndef WITHOUT_ASCII_PTEX
+ } else if (ch > fm->lastchar && ch <= JFM_LASTCHAR) {
+ idx = 0;
+#endif /* !WITHOUT_ASCII_PTEX */
} else {
ERROR("Invalid char: %ld\n", ch);
}
@@ -1061,6 +1065,10 @@
default:
idx = ch;
}
+#ifndef WITHOUT_ASCII_PTEX
+ } else if (ch > fm->lastchar && ch <= JFM_LASTCHAR) {
+ idx = 0;
+#endif /* !WITHOUT_ASCII_PTEX */
} else {
ERROR("Invalid char: %ld\n", ch);
}
@@ -1092,6 +1100,10 @@
default:
idx = ch;
}
+#ifndef WITHOUT_ASCII_PTEX
+ } else if (ch > fm->lastchar && ch <= JFM_LASTCHAR) {
+ idx = 0;
+#endif /* !WITHOUT_ASCII_PTEX */
} else {
ERROR("Invalid char: %ld\n", ch);
}
More information about the tex-live-commits
mailing list.