]> granicus.if.org Git - imagemagick/commitdiff
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7330
authorCristy <urban-warrior@imagemagick.org>
Tue, 3 Apr 2018 18:39:27 +0000 (14:39 -0400)
committerCristy <urban-warrior@imagemagick.org>
Tue, 3 Apr 2018 18:39:27 +0000 (14:39 -0400)
MagickCore/fx.c
MagickCore/property.c

index f6b42ad466163fff232d4b6bcaf6a0ea5d46dc70..8d7d4d4100867b791e9cfd66ac9bdc11dcf48738 100644 (file)
@@ -1825,7 +1825,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel,
     case 'z':
     {
       if (LocaleCompare(symbol,"z") == 0)
-        return((double)GetImageDepth(image, fx_info->exception));
+        return((double) GetImageDepth(image,fx_info->exception));
       break;
     }
     default:
index f7f5f4dfc6e0aefcb37f1170ee5da4c697c48e90..b0f93ff4ac94c27435b5f79a76da04a0ce3ec43d 100644 (file)
@@ -3654,6 +3654,8 @@ RestoreMSCWarning
                 OptionWarning,"NoImageForProperty","\"%%[%s]\"",pattern);
               continue; /* else no image to retrieve artifact */
             }
+          if ((image->columns == 0) || (image->rows == 0))
+            break;
           fx_info=AcquireFxInfo(image,pattern+3,exception);
           status=FxEvaluateChannelExpression(fx_info,IntensityPixelChannel,0,0,
             &value,exception);