]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/1242
authorCristy <urban-warrior@imagemagick.org>
Wed, 28 Nov 2018 00:59:35 +0000 (19:59 -0500)
committerCristy <urban-warrior@imagemagick.org>
Wed, 28 Nov 2018 00:59:35 +0000 (19:59 -0500)
MagickCore/profile.c
MagickCore/property.c

index 5bd241a6d8ccdda6867b3a9542aaa1e7fc729050..6c63b28c42f015dc1814356243f1ef4801c4cfe3 100644 (file)
@@ -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;
         }
index dbf1e98aa3f5e26004d687cca8110a48216528df..1890b83c356f58060c0d15897a6de8cd312a9e2d 100644 (file)
@@ -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))