Commit b3b8d209e for imagemagick.org
commit b3b8d209e1daee47600cac62510c4b1e6d7380ba
Author: Cristy <urban-warrior@imagemagick.org>
Date: Tue Jun 30 19:53:49 2026 -0400
move add check to private header
diff --git a/MagickCore/memory-private.h b/MagickCore/memory-private.h
index 2781fde00..075064d57 100644
--- a/MagickCore/memory-private.h
+++ b/MagickCore/memory-private.h
@@ -43,6 +43,17 @@ extern "C" {
#define MagickAssumeAligned(address) (address)
#endif
+static inline MagickBooleanType HeapOverflowCheckAdd(const size_t size,
+ const size_t increment)
+{
+ if (size > (MAGICK_SIZE_MAX-increment))
+ {
+ errno=ENOMEM;
+ return(MagickTrue);
+ }
+ return(MagickFalse);
+}
+
static inline size_t OverAllocateMemory(const size_t length)
{
size_t
diff --git a/MagickCore/memory_.h b/MagickCore/memory_.h
index d9a593fc7..24ebf6ffa 100644
--- a/MagickCore/memory_.h
+++ b/MagickCore/memory_.h
@@ -107,17 +107,6 @@ static inline MagickBooleanType HeapOverflowSanityCheckGetSize(
return(MagickFalse);
}
-static inline MagickBooleanType HeapOverflowSanityCheckAddition(
- const size_t size,const size_t increment)
-{
- if (size > (MAGICK_SIZE_MAX-increment))
- {
- errno=ENOMEM;
- return(MagickTrue);
- }
- return(MagickFalse);
-}
-
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/coders/ept.c b/coders/ept.c
index fb7e63b20..22dd1acab 100644
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -55,6 +55,7 @@
#include "MagickCore/list.h"
#include "MagickCore/magick.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/memory-private.h"
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
#include "MagickCore/quantize.h"
@@ -201,7 +202,7 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception)
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
ept_info.postscript_offset=(MagickOffsetType) ReadBlobLSBLong(image);
ept_info.postscript_length=ReadBlobLSBLong(image);
- if (HeapOverflowSanityCheckAddition(ept_info.postscript_length,1) != MagickFalse)
+ if (HeapOverflowCheckAdd(ept_info.postscript_length,1) != MagickFalse)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
if ((MagickSizeType) ept_info.postscript_length > GetBlobSize(image))
ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile");
@@ -209,7 +210,7 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception)
(void) ReadBlobLSBLong(image);
ept_info.tiff_offset=(MagickOffsetType) ReadBlobLSBLong(image);
ept_info.tiff_length=ReadBlobLSBLong(image);
- if (HeapOverflowSanityCheckAddition(ept_info.tiff_length,1) != MagickFalse)
+ if (HeapOverflowCheckAdd(ept_info.tiff_length,1) != MagickFalse)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
if ((ept_info.postscript_length+ept_info.tiff_length) == 0)
ThrowReaderException(CorruptImageError,"ImproperImageHeader");