From a94c4c037c9737a598135c99bfd896e8931a4c16 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 25 Sep 2020 23:31:46 +0000 Subject: Fix a bug introduced by the changes in pdfobj.c on 2020-09-05. (S. Hirata) git-svn-id: svn://tug.org/texlive/trunk@56436 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 10 ++++++++++ Build/source/texk/dvipdfm-x/configure | 22 +++++++++++----------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- Build/source/texk/dvipdfm-x/pdflimits.h | 3 ++- Build/source/texk/dvipdfm-x/pdfobj.c | 17 ++++++++++++----- 5 files changed, 36 insertions(+), 18 deletions(-) (limited to 'Build/source/texk/dvipdfm-x') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 6c2dcf7a678..32d6485d7aa 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,13 @@ +2020-09-26 Shunsaku Hirata + + * pdfobj.c: Fix a bug that the max number of indirect objects + is wrongly set, causing a problem when too many indirect + objects are created. + * pdflimit.h: Add PDF_NUM_INDIRECT_MAX indicating the maximum + number of indirect objects which can be allocated as described + in PDF Ref. v.1.7 and ISO 32000-1. + * configure.ac: Version 20200926. + 2020-09-24 Shunsaku Hirata * pdffont.c: Fix a bug introduced by the recent font related diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index e50a5a911a4..63314a88371 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) 20200924. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20200926. # # 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='20200924' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20200924' +PACKAGE_VERSION='20200926' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20200926' 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) 20200924 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20200926 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) 20200924:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20200926:";; 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 20200924 +dvipdfm-x (TeX Live) configure 20200926 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 20200924, which was +It was created by dvipdfm-x (TeX Live) $as_me 20200926, 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='20200924' + VERSION='20200926' cat >>confdefs.h <<_ACEOF @@ -14746,7 +14746,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20200924 +dvipdfm-x (TeX Live) config.lt 20200926 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 20200924, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20200926, 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 20200924 +dvipdfm-x (TeX Live) config.status 20200926 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 0e45fdc994e..fe6a3f0fc17 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)], [20200924], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20200926], [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/pdflimits.h b/Build/source/texk/dvipdfm-x/pdflimits.h index 7bd6332afa0..087e7df12e4 100644 --- a/Build/source/texk/dvipdfm-x/pdflimits.h +++ b/Build/source/texk/dvipdfm-x/pdflimits.h @@ -36,6 +36,7 @@ * PDF_NAME_LEN_MAX: see, Appendix C of PDF Ref. v1.3, 2nd. ed. * This is Acrobat implementation limit. */ -#define PDF_NAME_LEN_MAX 127 +#define PDF_NAME_LEN_MAX 127 +#define PDF_NUM_INDIRECT_MAX 8388607ul #endif /* _PDFLIMITS_H_ */ diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c index 76f2155ec15..804466378bc 100644 --- a/Build/source/texk/dvipdfm-x/pdfobj.c +++ b/Build/source/texk/dvipdfm-x/pdfobj.c @@ -231,8 +231,12 @@ struct pdf_out { pdf_obj *xref_stream; pdf_obj *output_stream; pdf_obj *current_objstm; - - char *free_list; /* 8192bytes each bit representing if the object is freed */ + /* The following flag bits are (8,338,607+1)/8 bytes data + * each bit represenging if the object is freed. + * Where the value 8,338,607 is taken from PDF ref. manual, v.1.7, + * Appendix C, "Implementation Limits". + */ + char *free_list; }; #if defined(LIBDPX) @@ -287,8 +291,8 @@ init_pdf_out_struct (pdf_out *p) p->output_stream = NULL; p->current_objstm = NULL; - p->free_list = NEW(8192, char); - memset(p->free_list, 0, 8192); + p->free_list = NEW((PDF_NUM_INDIRECT_MAX+1)/8, char); + memset(p->free_list, 0, (PDF_NUM_INDIRECT_MAX+1)/8); } static void @@ -913,6 +917,9 @@ pdf_label_obj (pdf_out *p, pdf_obj *object) * Don't change label on an already labeled object. Ignore such calls. */ if (object->label == 0) { + if (p->obj.next_label == PDF_NUM_INDIRECT_MAX) { + ERROR("Number of indirect object has reached its maximum value!"); + } object->label = p->obj.next_label++; object->generation = 0; } @@ -1444,7 +1451,7 @@ write_array (pdf_out *p, pdf_array *array) type1 = type2; pdf_write_obj(p, array->values[i]); } else - WARN("PDF array element #ld undefined.", i); + WARN("PDF array element %ld undefined.", i); } } pdf_out_char(p, ']'); -- cgit v1.2.3