From 60af6f4d1f37b4c5682907ee035cba2d7af9ebf8 Mon Sep 17 00:00:00 2001 From: Cristy Date: Tue, 27 Nov 2018 19:59:35 -0500 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1242 --- MagickCore/profile.c | 14 ++++++++++++-- MagickCore/property.c | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) 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)) -- 2.40.0