From 4e4ef877d4137ddae6141f3331ed61b97f6c87af Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 29 Oct 2021 05:03:47 +0000 Subject: fix a bug that dvipdfmx segfaults for CFF based OpenType font without a private dictionary (Marcel Fabian Krüger) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://tug.org/texlive/trunk@60886 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 7 +++++++ Build/source/texk/dvipdfm-x/cidtype0.c | 6 +++++- Build/source/texk/dvipdfm-x/configure | 22 +++++++++++----------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- 4 files changed, 24 insertions(+), 13 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 1c756ea7454..eb498a36c16 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,10 @@ +2021-10-29 Marcel Fabian Kr\"uger + + * cidtype0.c: Fix a bug that dvipdfmx segfaults when embedding + a CFF based OpenType font which does not contain a private + dictionary. + * configure.ac: version 20211029. + 2021-10-16 Akira Kakuto * dvipdfmx.c: Fix a bug that the -r option was not effective, diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c index fd00dd7bd8d..86a90af287f 100644 --- a/Build/source/texk/dvipdfm-x/cidtype0.c +++ b/Build/source/texk/dvipdfm-x/cidtype0.c @@ -1401,7 +1401,11 @@ CIDFont_type0_t1cdofont (pdf_font *font) cff_add_string(cffont, "Identity", 1); cff_dict_update(cffont->topdict, cffont); - cff_dict_update(cffont->private[0], cffont); + + if (cffont->private && cffont->private[0]) { + cff_dict_update(cffont->private[0], cffont); + } + cff_update_string(cffont); /* CFF code need to be rewrote... */ diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index f278c6643a7..51c21ffa652 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.71 for dvipdfm-x (TeX Live) 20211016. +# Generated by GNU Autoconf 2.71 for dvipdfm-x (TeX Live) 20211029. # # Report bugs to . # @@ -629,8 +629,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20211016' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20211016' +PACKAGE_VERSION='20211029' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20211029' PACKAGE_BUGREPORT='dvipdfmx@tug.org' PACKAGE_URL='' @@ -1395,7 +1395,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) 20211016 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20211029 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1467,7 +1467,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20211016:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20211029:";; esac cat <<\_ACEOF @@ -1597,7 +1597,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfm-x (TeX Live) configure 20211016 +dvipdfm-x (TeX Live) configure 20211029 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2353,7 +2353,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 20211016, which was +It was created by dvipdfm-x (TeX Live) $as_me 20211029, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -8675,7 +8675,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20211016' + VERSION='20211029' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15480,7 +15480,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20211016 +dvipdfm-x (TeX Live) config.lt 20211029 configured by $0, generated by GNU Autoconf 2.71. Copyright (C) 2011 Free Software Foundation, Inc. @@ -17392,7 +17392,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 20211016, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20211029, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17464,7 +17464,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -dvipdfm-x (TeX Live) config.status 20211016 +dvipdfm-x (TeX Live) config.status 20211029 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac index ac1a562c395..abdf1c09af7 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)], [20211016], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20211029], [dvipdfmx@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) -- cgit v1.2.3