From f90c3545af4782ea5844735a3c8c30338b395521 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 12 Feb 2021 02:22:56 +0000 Subject: Fix a bug that current_font is not checked properly when calculating "phantom" box. (S. Hirata) git-svn-id: svn://tug.org/texlive/trunk@57720 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 6 ++++++ Build/source/texk/dvipdfm-x/configure | 22 +++++++++++----------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- Build/source/texk/dvipdfm-x/dvi.c | 9 ++++++++- 4 files changed, 26 insertions(+), 13 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 121ab413cf7..afb4702b6cc 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,9 @@ +2021-02-12 Shunsaku Hirata + + * dvi.c: Fix a bug (segfault) that current_font is not checked + properly when catch_phantom=1. + * configure.ac: Version 20210212. + 2021-01-31 Shunsaku Hirata * spc_misc.c: Processing of pdffontatrr special should be diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 579c9abfd6f..be146fd367b 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210124. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210212. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20210124' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20210124' +PACKAGE_VERSION='20210212' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20210212' PACKAGE_BUGREPORT='dvipdfmx@tug.org' PACKAGE_URL='' @@ -1350,7 +1350,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 dvipdfm-x (TeX Live) 20210124 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20210212 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210124:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210212:";; esac cat <<\_ACEOF @@ -1551,7 +1551,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfm-x (TeX Live) configure 20210124 +dvipdfm-x (TeX Live) configure 20210212 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2390,7 +2390,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 dvipdfm-x (TeX Live) $as_me 20210124, which was +It was created by dvipdfm-x (TeX Live) $as_me 20210212, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8072,7 +8072,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20210124' + VERSION='20210212' cat >>confdefs.h <<_ACEOF @@ -14741,7 +14741,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20210124 +dvipdfm-x (TeX Live) config.lt 20210212 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16631,7 +16631,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 dvipdfm-x (TeX Live) $as_me 20210124, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20210212, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16701,7 +16701,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="\\ -dvipdfm-x (TeX Live) config.status 20210124 +dvipdfm-x (TeX Live) config.status 20210212 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac index b0ae737d076..d8b2b4eec25 100644 --- a/Build/source/texk/dvipdfm-x/configure.ac +++ b/Build/source/texk/dvipdfm-x/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([dvipdfm-x (TeX Live)], [20210124], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20210212], [dvipdfmx@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 9033d2c2659..473c52e8c3c 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -1380,7 +1380,14 @@ void dvi_right (int32_t x) pdf_rect rect; spt_t width, height, depth; if (catch_phantom == 1) { - height = loaded_fonts[current_font].size; + if (current_font >= 0 && current_font < num_loaded_fonts) { + height = loaded_fonts[current_font].size; + } else { + if (dpx_conf.verbose_level > 0) { + WARN("Don't know how to calculate the box height since current font is not set..."); + } + height = 0.0; + } depth = 0.0; } else { height = phantom_height / dvi2pts; -- cgit v1.2.3