From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 27 Sep 2015 14:47:45 +0000 (-0400)
Subject: http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28412
X-Git-Tag: 7.0.1-0~592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6fb02dc1886ecc7669872eb4144730b42b871b7;p=imagemagick

http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28412
---

diff --git a/coders/clip.c b/coders/clip.c
index 275d5b953..9466e4f65 100644
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -232,8 +232,10 @@ static MagickBooleanType WriteCLIPImage(const ImageInfo *image_info,
   clip_image=GetImageMask(image,exception);
   if (clip_image == (Image *) NULL)
     return(MagickFalse);
-  (void) CopyMagickString(clip_image->filename,image->filename,MagickPathExtent);
+  (void) CopyMagickString(clip_image->filename,image->filename,
+    MagickPathExtent);
   write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"CLIP") == 0)
     (void) FormatLocaleString(clip_image->filename,MagickPathExtent,"miff:%s",
diff --git a/coders/histogram.c b/coders/histogram.c
index 0fb2780e9..bb70b22c5 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -369,10 +369,11 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   (void) CopyMagickString(histogram_image->filename,image_info->filename,
     MagickPathExtent);
   write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"HISTOGRAM") == 0)
-    (void) FormatLocaleString(histogram_image->filename,MagickPathExtent,"miff:%s",
-      write_info->filename);
+    (void) FormatLocaleString(histogram_image->filename,MagickPathExtent,
+      "miff:%s",write_info->filename);
   status=WriteImage(write_info,histogram_image,exception);
   histogram_image=DestroyImage(histogram_image);
   write_info=DestroyImageInfo(write_info);
diff --git a/coders/mask.c b/coders/mask.c
index 1b317f5bb..ee715e1b6 100644
--- a/coders/mask.c
+++ b/coders/mask.c
@@ -297,8 +297,10 @@ static MagickBooleanType WriteMASKImage(const ImageInfo *image_info,
   mask_image=MaskImage(image,exception);
   if (mask_image == (Image *) NULL)
     return(MagickFalse);
-  (void) CopyMagickString(mask_image->filename,image->filename,MagickPathExtent);
+  (void) CopyMagickString(mask_image->filename,image->filename,
+    MagickPathExtent);
   write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"MASK") == 0)
     (void) FormatLocaleString(mask_image->filename,MagickPathExtent,"miff:%s",
diff --git a/coders/preview.c b/coders/preview.c
index baaab5530..14354b89e 100644
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -187,6 +187,7 @@ static MagickBooleanType WritePreviewImage(const ImageInfo *image_info,
   (void) CopyMagickString(preview_image->filename,image_info->filename,
     MagickPathExtent);
   write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"PREVIEW") == 0)
     (void) FormatLocaleString(preview_image->filename,MagickPathExtent,
diff --git a/coders/thumbnail.c b/coders/thumbnail.c
index 07dd0a196..46db7c8c6 100644
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -208,6 +208,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info,
   (void) CopyMagickString(thumbnail_image->filename,image->filename,
     MagickPathExtent);
   write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"THUMBNAIL") == 0)
     (void) FormatLocaleString(thumbnail_image->filename,MagickPathExtent,
diff --git a/coders/vid.c b/coders/vid.c
index 087210769..1cdac5729 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -333,6 +333,7 @@ static MagickBooleanType WriteVIDImage(const ImageInfo *image_info,Image *image,
   (void) CopyMagickString(montage_image->filename,image_info->filename,
     MagickPathExtent);
   write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"VID") == 0)
     (void) FormatLocaleString(montage_image->filename,MagickPathExtent,