From f6650d1ca0dc21d2991c50e8deb01dfc81817bc4 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sat, 12 Apr 2025 12:16:56 +0200 Subject: [PATCH] Move the MagickMin check to methods that get the value from the policy. --- MagickCore/memory.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/MagickCore/memory.c b/MagickCore/memory.c index f6a3ac4b9e..e198ddf6a4 100644 --- a/MagickCore/memory.c +++ b/MagickCore/memory.c @@ -1062,15 +1062,14 @@ static size_t GetMaxMemoryRequestFromPolicy(void) MinMemoryRequest,100.0)); value=DestroyString(value); } - return(max); + return(MagickMin(max,(size_t) MAGICK_SSIZE_MAX)); } MagickExport size_t GetMaxMemoryRequest(void) { - if (max_memory_request == 0) max_memory_request=GetMaxMemoryRequestFromPolicy(); - return(MagickMin(max_memory_request,(size_t) MAGICK_SSIZE_MAX)); + return(max_memory_request); } /* @@ -1108,14 +1107,14 @@ static size_t GetMaxProfileSizeFromPolicy(void) max=StringToSizeType(value,100.0); value=DestroyString(value); } - return(max); + return(MagickMin(max,(size_t) MAGICK_SSIZE_MAX)); } MagickExport size_t GetMaxProfileSize(void) { if (max_profile_size == 0) max_profile_size=GetMaxProfileSizeFromPolicy(); - return(MagickMin(max_profile_size,(size_t) MAGICK_SSIZE_MAX)); + return(max_profile_size); } /*