]> granicus.if.org Git - imagemagick/commitdiff
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5838
authorCristy <urban-warrior@imagemagick.org>
Tue, 30 Jan 2018 19:40:29 +0000 (14:40 -0500)
committerCristy <urban-warrior@imagemagick.org>
Tue, 30 Jan 2018 19:40:29 +0000 (14:40 -0500)
MagickCore/geometry.c
configure

index 7cfc8cd021f0066b1575d91bb6778e835efa2c8f..87e664273dc9a8d6475f063b327bd73fdd2402ff 100644 (file)
@@ -1498,8 +1498,10 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,ssize_t *x,
       scale.y=(double) former_height*PerceptibleReciprocal(distance/sqrt(area));
       if ((scale.x < (double) *width) || (scale.y < (double) *height))
         {
-          *width=(unsigned long) (former_width/(distance/sqrt(area)));
-          *height=(unsigned long) (former_height/(distance/sqrt(area)));
+          *width=(unsigned long) (former_width*PerceptibleReciprocal(
+            distance/sqrt(area)));
+          *height=(unsigned long) (former_height*PerceptibleReciprocal(
+            distance/sqrt(area)));
         }
       former_width=(*width);
       former_height=(*height);
index ac6cb46543314801a5c026a3204816ebd25b250f..51eb2bd88366316ef25bba12c7de8be2a02087a2 100755 (executable)
--- a/configure
+++ b/configure
@@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=23
 
 MAGICK_VERSION=7.0.7-23
 
-MAGICK_GIT_REVISION=22562:23246df8d:20180130
+MAGICK_GIT_REVISION=22573:84ae5bdb7:20180130
 
 
 # Substitute library versioning