diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-07-04 03:26:54 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-07-04 03:26:54 +0000 |
commit | f2087774db76f092475e93e121925f8a3b00fc55 (patch) | |
tree | a0f90eca500d51f0052f1f8c618e9ed1a4970f12 /Build/source | |
parent | 6d013a8c5100b9160835ec9a9a82dc10bfe6551b (diff) |
Fix a bug in pdfcolor.c. Add initialization and NULL pointer check. (S. Hirata)
git-svn-id: svn://tug.org/texlive/trunk@55746 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 6 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/configure | 22 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/pdfcolor.c | 16 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/spc_util.c | 1 |
5 files changed, 29 insertions, 18 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index edcb59c9241..fdd8bedb9e0 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,9 @@ +2020-07-04 Shunsaku Hirata <shunsaku.hirata74@gmail.com> + + * pdfcolor.c, spc_util.c: Fix a bug in pdfcolor.c. + Add initialization of a variable and NULL pointer check. + * configure.ac: Version 20200704. + 2020-07-02 Shunsaku Hirata <shunsaku.hirata74@gmail.com> * pdfdoc.c, spc_pdfm.c: Possible fix for a bug that pdf:btrans diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index b92dd53a2df..0824254e9c9 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) 20200627. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20200704. # # 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='20200627' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20200627' +PACKAGE_VERSION='20200704' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20200704' 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) 20200627 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20200704 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) 20200627:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20200704:";; 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 20200627 +dvipdfm-x (TeX Live) configure 20200704 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 20200627, which was +It was created by dvipdfm-x (TeX Live) $as_me 20200704, 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='20200627' + VERSION='20200704' 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 20200627 +dvipdfm-x (TeX Live) config.lt 20200704 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 20200627, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20200704, 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 20200627 +dvipdfm-x (TeX Live) config.status 20200704 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 629094a73f6..b32161303d5 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)], [20200627], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20200704], [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/pdfcolor.c b/Build/source/texk/dvipdfm-x/pdfcolor.c index 55b26484b98..579a7e44d5f 100644 --- a/Build/source/texk/dvipdfm-x/pdfcolor.c +++ b/Build/source/texk/dvipdfm-x/pdfcolor.c @@ -173,9 +173,10 @@ pdf_color_brighten_color (pdf_color *dst, const pdf_color *src, double f) { ASSERT(dst && src); - if (dst->type != PDF_COLORSPACE_TYPE_RGB && - dst->type != PDF_COLORSPACE_TYPE_CMYK && - dst->type != PDF_COLORSPACE_TYPE_GRAY) { + if (src->type != PDF_COLORSPACE_TYPE_RGB && + src->type != PDF_COLORSPACE_TYPE_CMYK && + src->type != PDF_COLORSPACE_TYPE_GRAY) { + pdf_color_copycolor(dst, src); return; } @@ -185,7 +186,8 @@ pdf_color_brighten_color (pdf_color *dst, const pdf_color *src, double f) double f0, f1; int n; - n = dst->num_components = src->num_components; + pdf_color_copycolor(dst, src); + n = src->num_components; f1 = n == 4 ? 0.0 : f; /* n == 4 is CMYK, others are RGB and Gray */ f0 = 1.0-f; @@ -442,8 +444,10 @@ pdf_color_clear_stack (void) WARN("You've mistakenly made a global color change within nested colors."); } while (color_stack.current--) { - free(color_stack.stroke[color_stack.current].spot_color_name); - free(color_stack.fill[color_stack.current].spot_color_name); + if (color_stack.stroke[color_stack.current].spot_color_name) + RELEASE(color_stack.stroke[color_stack.current].spot_color_name); + if (color_stack.fill[color_stack.current].spot_color_name) + RELEASE(color_stack.fill[color_stack.current].spot_color_name); } color_stack.current = 0; pdf_color_black(color_stack.stroke); diff --git a/Build/source/texk/dvipdfm-x/spc_util.c b/Build/source/texk/dvipdfm-x/spc_util.c index 81bb2e07efb..002d85ac257 100644 --- a/Build/source/texk/dvipdfm-x/spc_util.c +++ b/Build/source/texk/dvipdfm-x/spc_util.c @@ -428,6 +428,7 @@ spc_util_read_colorspec (struct spc_env *spe, pdf_color *colorspec, struct spc_a return -1; } + pdf_color_black(colorspec); /* As initialization... */ if (syntax) return spc_read_color_color(spe, colorspec, ap); else |