From: cristy Date: Sat, 3 Jan 2015 18:43:18 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~1503 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=327f591d8e51690c14b0206c0944853aa28b6832;p=imagemagick --- diff --git a/MagickCore/resource.c b/MagickCore/resource.c index d2c3166b4..7cc6379b8 100644 --- 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 9a3bf0f12..b4ee2d23a 100644 --- a/config/policy.xml +++ b/config/policy.xml @@ -48,8 +48,8 @@ - - + +