averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-05-25 11:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move the MagickMin check to methods that get the value from the policy.

Browse Source
This commit is contained in:
Dirk Lemstra
2025-04-12 12:16:56 +02:00
parent 212d67c9ac
commit f6650d1ca0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MagickCore/memory.c
+4 -5
View File
@@ -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);
}
/*