From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 7 Mar 2018 23:00:59 +0000 (-0500)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6778
X-Git-Tag: 7.0.7-26~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1547c6d84dd0312d6f60b36cb49702c4d26260a9;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6778
---

diff --git a/coders/dcm.c b/coders/dcm.c
index 7de8e5f65..8c155c2de 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -2981,6 +2981,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
 {
 #define ThrowDCMException(exception,message) \
 { \
+  if (info.scale != (Quantum *) NULL) \
+    info.scale=(Quantum *) RelinquishMagickMemory(info.scale); \
   if (data != (unsigned char *) NULL) \
     data=(unsigned char *) RelinquishMagickMemory(data); \
   if (graymap != (int *) NULL) \
@@ -4037,8 +4039,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (stream_info->offsets != (ssize_t *) NULL)
               stream_info->offsets=(ssize_t *)
                 RelinquishMagickMemory(stream_info->offsets);
-            if (info.scale != (Quantum *) NULL)
-              info.scale=(Quantum *) RelinquishMagickMemory(info.scale);
             ThrowDCMException(CorruptImageError,"ImproperImageHeader");
           }
         stream_info->count=0;