From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 26 Dec 2014 01:05:37 +0000 (+0000)
Subject: Don't set image_info->magick if its already defined.
X-Git-Tag: 7.0.1-0~1549
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29357222429d5638b04d1848be0163f86c2ab4fd;p=imagemagick

Don't set image_info->magick if its already defined.
---

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 35dcb9463..ddfe42159 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2431,7 +2431,8 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
         }
     }
   *extension='\0';
-  GetPathComponent(image_info->filename,ExtensionPath,extension);
+  if (*image_info->magick != '\0')
+    GetPathComponent(image_info->filename,ExtensionPath,extension);
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
   if (*extension != '\0')
     if ((LocaleCompare(extension,"gz") == 0) ||