From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 29 Dec 2014 23:04:38 +0000 (+0000)
Subject: Initialize width / height resource limits as per policy.xml.
X-Git-Tag: 7.0.1-0~1519
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfd91dfe05a7633b98dd3823e3a559d1a82d328b;p=imagemagick

Initialize width / height resource limits as per policy.xml.
---

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 9594a2caf..9f7be5ef7 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -1051,7 +1051,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void)
 #if defined(PixelCacheThreshold)
   memory=PixelCacheThreshold;
 #endif
-  (void) SetMagickResourceLimit(AreaResource,2*memory);
+  (void) SetMagickResourceLimit(WidthResource,resource_info.width_limit);
   limit=GetEnvironmentValue("MAGICK_WIDTH_LIMIT");
   if (limit != (char *) NULL)
     {
@@ -1059,6 +1059,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void)
         100.0));
       limit=DestroyString(limit);
     }
+  (void) SetMagickResourceLimit(HeightResource,resource_info.height_limit);
   limit=GetEnvironmentValue("MAGICK_HEIGHT_LIMIT");
   if (limit != (char *) NULL)
     {
@@ -1066,6 +1067,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void)
         100.0));
       limit=DestroyString(limit);
     }
+  (void) SetMagickResourceLimit(AreaResource,2*memory);
   limit=GetEnvironmentValue("MAGICK_AREA_LIMIT");
   if (limit != (char *) NULL)
     {