From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 28 Nov 2018 00:59:35 +0000 (-0500)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1242
X-Git-Tag: 7.0.8-15~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60af6f4d1f37b4c5682907ee035cba2d7af9ebf8;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1242
---

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 5bd241a6d..6c63b28c4 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -2159,13 +2159,23 @@ MagickBooleanType SyncExifProfile(Image *image,StringInfo *profile)
       {
         case 0x011a:
         {
-          (void) WriteProfileLong(endian,(size_t) (image->resolution.x+0.5),p);
+          if (number_bytes == 4)
+            {
+              (void) WriteProfileLong(endian,(size_t) (image->resolution.x+
+                0.5),p);
+              break;
+            }
           (void) WriteProfileLong(endian,1UL,p+4);
           break;
         }
         case 0x011b:
         {
-          (void) WriteProfileLong(endian,(size_t) (image->resolution.y+0.5),p);
+          if (number_bytes == 4)
+            {
+              (void) WriteProfileLong(endian,(size_t) (image->resolution.y+
+                0.5),p);
+              break;
+            }
           (void) WriteProfileLong(endian,1UL,p+4);
           break;
         }
diff --git a/MagickCore/property.c b/MagickCore/property.c
index dbf1e98aa..1890b83c3 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1431,8 +1431,8 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
         format;
 
       ssize_t
-        number_bytes,
-        components;
+        components,
+        number_bytes;
 
       q=(unsigned char *) (directory+(12*entry)+2);
       if (q > (exif+length-12))