From 0093cffaf900a8a5708be6810fda6caf4df49099 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 5 Jun 2016 19:00:17 -0400
Subject: [PATCH] 
 https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29850

---
 MagickCore/image.c   | 12 ++++++------
 MagickCore/utility.c |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 258bae2cc..c9c718d0d 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1107,7 +1107,7 @@ MagickExport MagickBooleanType CopyImagePixels(Image *image,
         i;
 
       for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
-      { 
+      {
         PixelChannel channel=GetPixelChannelChannel(image,i);
         PixelTrait traits=GetPixelChannelTraits(image,channel);
         PixelTrait source_traits=GetPixelChannelTraits(source_image,channel);
@@ -2674,6 +2674,8 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
     {
       (void) CopyMagickString(magic,image_info->magick,MagickPathExtent);
       magick_info=GetMagickInfo(magic,sans_exception);
+      GetPathComponent(image_info->filename,CanonicalPath,component);
+      (void) CopyMagickString(image_info->filename,component,MagickPathExtent);
     }
   else
     {
@@ -2687,17 +2689,15 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
         {
           (void) CopyMagickString(image_info->magick,magic,MagickPathExtent);
           image_info->affirm=MagickTrue;
+          GetPathComponent(image_info->filename,CanonicalPath,component);
+          (void) CopyMagickString(image_info->filename,component,
+            MagickPathExtent);
         }
     }
   sans_exception=DestroyExceptionInfo(sans_exception);
   if ((magick_info == (const MagickInfo *) NULL) ||
       (GetMagickEndianSupport(magick_info) == MagickFalse))
     image_info->endian=UndefinedEndian;
-  if (image_info->affirm != MagickFalse)
-    {
-      GetPathComponent(image_info->filename,CanonicalPath,component);
-      (void) CopyMagickString(image_info->filename,component,MagickPathExtent);
-    }
   if ((image_info->adjoin != MagickFalse) && (frames > 1))
     {
       /*
diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index 75d4ec41f..5d47c5e1e 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -1245,7 +1245,7 @@ MagickExport void GetPathComponent(const char *path,PathType type,
           {
             magick_length=(size_t) (p-component+1);
             for (q=component; *(++p) != '\0'; q++)
-              *q=*p;
+              *q=(*p);
             *q='\0';
           }
         break;
@@ -1291,7 +1291,7 @@ MagickExport void GetPathComponent(const char *path,PathType type,
       if (magick_length != 0)
         (void) CopyMagickString(component,path,magick_length);
       else
-        *component = '\0';
+        *component='\0';
       break;
     }
     case RootPath:
-- 
2.40.0