Don't leak file paths for PDB & DPX formats

diff --git a/coders/dpx.c b/coders/dpx.c
index 38df30c295b9d762de1e636c37681a213b1f5e96..29f6f55db350677ba6eb0b3dd126862ecff695c1 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1461,9 +1461,6 @@ static inline const char *GetDPXProperty(const Image *image,
 static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
   ExceptionInfo *exception)
 {
-  char
-    *url;
-
   const char
     *value;
 
@@ -1595,9 +1592,8 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
     dpx.file.timestamp);
   offset+=WriteBlob(image,sizeof(dpx.file.timestamp),(unsigned char *)
     dpx.file.timestamp);
-  url=GetMagickHomeURL();
-  (void) strncpy(dpx.file.creator,url,sizeof(dpx.file.creator)-1);
-  url=DestroyString(url);
+  (void) strncpy(dpx.file.creator,MagickAuthoritativeURL,
+    sizeof(dpx.file.creator)-1);
   value=GetDPXProperty(image,"dpx:file.creator",exception);
   if (value != (const char *) NULL)
     (void) strncpy(dpx.file.creator,value,sizeof(dpx.file.creator)-1);

diff --git a/coders/pdb.c b/coders/pdb.c
index 891d9d8b2b61f674beae9801d9a9c8fbeca2cff3..32af400029d112a1c0dec0e8376df1c1635032d7 100644 (file)
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -73,6 +73,7 @@
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/module.h"
+#include "MagickCore/utility.h"
 \f
 /*
   Typedef declarations.
@@ -739,6 +740,9 @@ static unsigned char *EncodeRLE(unsigned char *destination,
 static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image,
   ExceptionInfo *exception)
 {
+  char
+    filename[MagickPathExtent];
+
   const char
     *comment;
 
@@ -807,8 +811,8 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image,
   }
   (void) memset(&pdb_info,0,sizeof(pdb_info));
   (void) memset(&pdb_image,0,sizeof(pdb_image));
-  (void) CopyMagickString(pdb_info.name,image_info->filename,
-    sizeof(pdb_info.name));
+  GetPathComponent(image_info->filename,TailPath,filename);
+  (void) CopyMagickString(pdb_info.name,filename,sizeof(pdb_info.name));
   pdb_info.attributes=0;
   pdb_info.version=0;
   pdb_info.create_time=time(NULL);

diff --git a/configure b/configure
index 4bc449505ea7f4816938ec14a093f6e313469489..754eaedcd8cefdd7b286c088b6f9c1f9c9e6f5a5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-32.
+# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-33.
 #
 # Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='7.0.8-32'
-PACKAGE_STRING='ImageMagick 7.0.8-32'
+PACKAGE_VERSION='7.0.8-33'
+PACKAGE_STRING='ImageMagick 7.0.8-33'
 PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues'
 PACKAGE_URL='https://imagemagick.org'
 
@@ -1852,7 +1852,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 ImageMagick 7.0.8-32 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.8-33 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1927,7 +1927,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 7.0.8-32:";;
+     short | recursive ) echo "Configuration of ImageMagick 7.0.8-33:";;
    esac
   cat <<\_ACEOF
 
@@ -2219,7 +2219,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 7.0.8-32
+ImageMagick configure 7.0.8-33
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3270,7 +3270,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 ImageMagick $as_me 7.0.8-32, which was
+It was created by ImageMagick $as_me 7.0.8-33, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4256,7 +4256,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ImageMagick'
- VERSION='7.0.8-32'
+ VERSION='7.0.8-33'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4566,11 +4566,11 @@ MAGICK_MINOR_VERSION=0
 
 MAGICK_MICRO_VERSION=8
 
-MAGICK_PATCHLEVEL_VERSION=32
+MAGICK_PATCHLEVEL_VERSION=33
 
-MAGICK_VERSION=7.0.8-32
+MAGICK_VERSION=7.0.8-33
 
-MAGICK_GIT_REVISION=15382:c0ce8818e:20190304
+MAGICK_GIT_REVISION=15387:912f96985:20190305
 
 
 # Substitute library versioning
@@ -37777,7 +37777,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 ImageMagick $as_me 7.0.8-32, which was
+This file was extended by ImageMagick $as_me 7.0.8-33, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -37844,7 +37844,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="\\
-ImageMagick config.status 7.0.8-32
+ImageMagick config.status 7.0.8-33
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index f27138e77fc6d5e9102081401a7261b851d056d1..dd89f3fd3e13edc12f8f13ab24b2fb32ce8d2029 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_PREREQ(2.69)
 m4_define([magick_major_version], [7])
 m4_define([magick_minor_version], [0])
 m4_define([magick_micro_version], [8])
-m4_define([magick_patchlevel_version], [32])
+m4_define([magick_patchlevel_version], [33])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
 m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | awk '{ print \$1 }' | tr -d '\n'"]))

diff --git a/version.sh b/version.sh
index cfb49d2e931c50f1cc55f28ba2de94cb31dd14fb..0cb34e7ccb285a590db788b850677ced1fb7b4d2 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -19,7 +19,7 @@ PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print
 PACKAGE_VERSION='7.0.8'
 PACKAGE_PERL_VERSION='7.0.8'
 PACKAGE_LIB_VERSION="0x708"
-PACKAGE_RELEASE="32"
+PACKAGE_RELEASE="33"
 PACKAGE_LIB_VERSION_NUMBER="7,0,8,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE_RAW=`date +%F`
 PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"