(no commit message)

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index d2c3166b4c2426b87a7b19e75e385c408895202f..7cc6379b8e76e5f7780dd17599e58a01e7e5328d 100644 (file)
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -114,8 +114,8 @@ static ResourceInfo
     MagickULLConstant(0),              /* initial thread */
     MagickULLConstant(0),              /* initial throttle */
     MagickULLConstant(0),              /* initial time */
-    MagickULLConstant(10000000),       /* width limit */
-    MagickULLConstant(10000000),       /* height limit */
+    (LONG_MAX/(5*sizeof(Quantum))),    /* width limit */
+    (LONG_MAX/(5*sizeof(Quantum))),    /* height limit */
     MagickULLConstant(3072)*1024*1024, /* area limit */
     MagickULLConstant(1536)*1024*1024, /* memory limit */
     MagickULLConstant(3072)*1024*1024, /* map limit */

diff --git a/config/policy.xml b/config/policy.xml
index 9a3bf0f120a30e8fcb3146cea006283d84ce1718..b4ee2d23acc68efa3c08c26d74a494d5b972a534 100644 (file)
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -48,8 +48,8 @@
   <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
   <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
   <!-- <policy domain="resource" name="map" value="4GiB"/> -->
-  <!-- <policy domain="resource" name="width" value="100MP"/> -->
-  <!-- <policy domain="resource" name="height" value="100MP"/> -->
+  <!-- <policy domain="resource" name="width" value="10MP"/> -->
+  <!-- <policy domain="resource" name="height" value="10MP"/> -->
   <!-- <policy domain="resource" name="area" value="1GB"/> -->
   <!-- <policy domain="resource" name="disk" value="16EB"/> -->
   <!-- <policy domain="resource" name="file" value="768"/> -->