summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-21 04:56:42 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-21 04:56:42 +0000
commitd651e84fcb7ac24f9677177e6ea57de7eebc083f (patch)
tree8b215d1d82626be67f2ba10b370e4cdabfb89d03 /Build/source
parent942a712305b66eaea72ab2eb669f0063df886fdf (diff)
Handles the case of circular reference properly (S. Hirata)
git-svn-id: svn://tug.org/texlive/trunk@48445 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog8
-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/pdfencrypt.c1
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.c45
5 files changed, 52 insertions, 26 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index dc4009a4652..6afb917c84e 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-21 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
+
+ * pdfobj.c: Fix for "infinite loop" detection. Now handles the
+ case of circular reference properly.
+ * pdfencrypt.c: Fixed bug that key size is not adjusted
+ correctly.
+ * configure.ac: Version 20180821.
+
2018-08-18 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* cidtype2.c: Workaround for CIDSet issue. All glyphs
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index d240994954b..307ba78063d 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) 20180506.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20180821.
#
# Report bugs to <tex-k@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='20180506'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20180506'
+PACKAGE_VERSION='20180821'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20180821'
PACKAGE_BUGREPORT='tex-k@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) 20180506 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20180821 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) 20180506:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20180821:";;
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 20180506
+dvipdfm-x (TeX Live) configure 20180821
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 20180506, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20180821, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8075,7 +8075,7 @@ fi
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20180506'
+ VERSION='20180821'
cat >>confdefs.h <<_ACEOF
@@ -14744,7 +14744,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20180506
+dvipdfm-x (TeX Live) config.lt 20180821
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16624,7 +16624,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 20180506, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20180821, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16694,7 +16694,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 20180506
+dvipdfm-x (TeX Live) config.status 20180821
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 dde7348ac5c..8363038da9a 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -7,7 +7,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)], [20180506], [tex-k@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20180821], [tex-k@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/pdfencrypt.c b/Build/source/texk/dvipdfm-x/pdfencrypt.c
index 3fc80eae1a2..d387172b2bf 100644
--- a/Build/source/texk/dvipdfm-x/pdfencrypt.c
+++ b/Build/source/texk/dvipdfm-x/pdfencrypt.c
@@ -476,6 +476,7 @@ check_version (struct pdf_sec *p, int version)
WARN("Current encryption setting requires PDF version >= 1.7" \
" (plus Adobe Extension Level 3).");
p->V = 4;
+ p->key_size = 16;
}
if (p->V == 5 && version < 20) {
p->setting.need_adobe_extension = 1;
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index e51cbe0227a..29fa4f6af8e 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -3886,15 +3886,12 @@ import_dict (pdf_obj *key, pdf_obj *value, void *pdata)
return 0;
}
-static pdf_obj loop_marker = { PDF_OBJ_INVALID, 0, 0, 0, 0, NULL };
-
static pdf_obj *
pdf_import_indirect (pdf_obj *object)
{
pdf_file *pf = OBJ_FILE(object);
unsigned int obj_num = OBJ_NUM(object);
unsigned short obj_gen = OBJ_GEN(object);
-
pdf_obj *ref;
ASSERT(pf);
@@ -3905,11 +3902,9 @@ pdf_import_indirect (pdf_obj *object)
}
if ((ref = pf->xref_table[obj_num].indirect)) {
- if (ref == &loop_marker)
- ERROR("Loop in object hierarchy detected. Broken PDF file?");
return pdf_link_obj(ref);
} else {
- pdf_obj *obj, *tmp;
+ pdf_obj *obj, *reserved, *imported;
obj = pdf_get_object(pf, obj_num, obj_gen);
if (!obj) {
@@ -3917,14 +3912,36 @@ pdf_import_indirect (pdf_obj *object)
return NULL;
}
- /* We mark the reference to be able to detect loops */
- pf->xref_table[obj_num].indirect = &loop_marker;
-
- tmp = pdf_import_object(obj);
-
- pf->xref_table[obj_num].indirect = ref = pdf_ref_obj(tmp);
-
- pdf_release_obj(tmp);
+ /* Fix for circular reference issue
+ *
+ * Older version of dvipdfmx disallowed the following case of
+ * circular reference:
+ * obj #1 --> << /Kids [2 0 R] >>
+ * obj #2 --> << /Parents [1 0 R] >>
+ * The problem is in that dvipdfmx gives new labels to objects after they
+ * are completely read.
+ *
+ * Dirty hack though...
+ */
+ reserved = pdf_new_null(); /* for reservation of label */
+ pf->xref_table[obj_num].indirect = ref = pdf_new_ref(reserved);
+ imported = pdf_import_object(obj);
+ /* Substitute object here...
+ * We can't use pdf_transfer_label() here, since "reserved" object may
+ * have already be referenced by others and possibly be deref'ed later.
+ */
+ reserved->refcount = imported->refcount;
+ reserved->type = imported->type;
+ reserved->flags = imported->flags;
+ reserved->data = imported->data;
+ /* Object returned by pdf_import_object(obj) might be simply a link to "obj".
+ * In that case we can't simply delete that object.
+ */
+ if (imported->refcount == 1) {
+ RELEASE(imported);
+ imported = NULL;
+ }
+ pdf_release_obj(reserved);
pdf_release_obj(obj);
return pdf_link_obj(ref);