From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 3 Apr 2018 18:39:27 +0000 (-0400)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7330
X-Git-Tag: 7.0.7-29~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e73d7ae0f0b5fb24e024a02de03485de728f8e5a;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7330
---

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index f6b42ad46..8d7d4d410 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -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:
diff --git a/MagickCore/property.c b/MagickCore/property.c
index f7f5f4dfc..b0f93ff4a 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -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);