summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-09-01 21:04:17 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-09-01 21:04:17 +0000
commit2b5a52bde31bedbb69ab710e37e6daee52647b59 (patch)
tree4fe514018b3df3aac8ec3db3fed682416dbfa608 /Build
parent0fb16338aa6fe27e03efc9d7cb939d2c5cedec41 (diff)
Fix an incompatible behavior introduced by the previous changes on the named object (rev.55887). (S. Hirara)
git-svn-id: svn://tug.org/texlive/trunk@56234 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog6
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure22
-rw-r--r--Build/source/texk/dvipdfm-x/configure.ac2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfnames.c15
4 files changed, 29 insertions, 16 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 2770d6300e5..bc8925b18a8 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,9 @@
+2020-09-02 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
+
+ * pdfnames.c: Fix an incompatible behavior introduced by the
+ previous changes on the named object (rev.55887).
+ * configure.ac: Version 20200902.
+
2020-08-26 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* spc_pdfm.c: Fix a bug exposed by the previous changes on the
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index aa1a785e0d7..01cb68dfe1e 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) 20200826.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20200902.
#
# Report bugs to <dvipdfmx@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20200826'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20200826'
+PACKAGE_VERSION='20200902'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20200902'
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) 20200826 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20200902 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) 20200826:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20200902:";;
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 20200826
+dvipdfm-x (TeX Live) configure 20200902
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 20200826, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20200902, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8077,7 +8077,7 @@ fi
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20200826'
+ VERSION='20200902'
cat >>confdefs.h <<_ACEOF
@@ -14746,7 +14746,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20200826
+dvipdfm-x (TeX Live) config.lt 20200902
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16636,7 +16636,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 20200826, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20200902, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16706,7 +16706,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 20200826
+dvipdfm-x (TeX Live) config.status 20200902
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 ba68e022200..dc047231bf5 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)], [20200826], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20200902], [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/pdfnames.c b/Build/source/texk/dvipdfm-x/pdfnames.c
index c6df49c0d43..103faaf6c63 100644
--- a/Build/source/texk/dvipdfm-x/pdfnames.c
+++ b/Build/source/texk/dvipdfm-x/pdfnames.c
@@ -224,8 +224,13 @@ pdf_names_lookup_reference (struct ht_table *names, const void *key, int keylen)
value = ht_lookup_table(names, key, keylen);
if (value) {
- if (!value->reference)
- value->reference = pdf_ref_obj(value->object);
+ if (!value->reference) {
+ if (value->object) {
+ value->reference = pdf_ref_obj(value->object);
+ } else {
+ WARN("Can't create object ref for already released object: %s", printable_key(key, keylen));
+ }
+ }
obj_ref = pdf_link_obj(value->reference);
} else {
/* A null object as dummy would create problems because as value
@@ -273,8 +278,10 @@ pdf_names_close_object (struct ht_table *names, const void *key, int keylen)
return -1;
}
- pdf_release_obj(value->object);
- value->object = NULL;
+ if (value->reference) {
+ pdf_release_obj(value->object);
+ value->object = NULL;
+ }
value->closed = 1;
return 0;