summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristy <mikayla-grace@urban-warrior.org>2021-01-02 16:58:54 -0500
committerCristy <mikayla-grace@urban-warrior.org>2021-01-02 16:58:54 -0500
commit6d9c0a4ad586bee773dc079ed52a72a73cd2342d (patch)
tree43e78233c40447c6362bedb08cb10db18aae05fa
parent89afeb43773d269c8f472e8c3554e8b94d398aa1 (diff)
downloadImageMagick-6d9c0a4ad586bee773dc079ed52a72a73cd2342d.tar.gz
use LONG_MIN define rather than SSIZE_MAX
-rw-r--r--MagickCore/blob.c14
-rw-r--r--MagickCore/cache.c16
-rw-r--r--MagickCore/distribute-cache.c12
-rw-r--r--MagickCore/draw.c8
-rw-r--r--MagickCore/image-private.h8
-rw-r--r--MagickCore/matrix.c8
-rw-r--r--MagickCore/memory.c2
-rw-r--r--MagickCore/nt-base.h7
-rw-r--r--MagickCore/pixel.c8
-rw-r--r--MagickCore/resource.c8
-rw-r--r--MagickCore/string.c2
-rw-r--r--MagickCore/transform.c8
-rw-r--r--MagickCore/xml-tree.c2
-rw-r--r--coders/ashlar.c20
-rw-r--r--coders/heic.c2
-rw-r--r--coders/tiff.c4
16 files changed, 61 insertions, 68 deletions
diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index fa19f5e5d..2a2dc025a 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -371,7 +371,7 @@ MagickExport MagickBooleanType BlobToFile(char *filename,const void *blob,
for (i=0; i < length; i+=count)
{
count=write(file,(const char *) blob+i,MagickMin(length-i,(size_t)
- SSIZE_MAX));
+ LONG_MAX));
if (count <= 0)
{
count=0;
@@ -1502,7 +1502,7 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent,
return(blob);
}
*length=(size_t) MagickMin(offset,(MagickOffsetType)
- MagickMin(extent,(size_t) SSIZE_MAX));
+ MagickMin(extent,(size_t) LONG_MAX));
blob=(unsigned char *) NULL;
if (~(*length) >= (MagickPathExtent-1))
blob=(unsigned char *) AcquireQuantumMemory(*length+MagickPathExtent,
@@ -1526,7 +1526,7 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent,
for (i=0; i < *length; i+=count)
{
count=read(file,blob+i,(size_t) MagickMin(*length-i,(size_t)
- SSIZE_MAX));
+ LONG_MAX));
if (count <= 0)
{
count=0;
@@ -3705,7 +3705,7 @@ MagickExport Image *PingBlob(const ImageInfo *image_info,const void *blob,
%
% ReadBlob() reads data from the blob or image file and returns it. It
% returns the number of bytes read. If length is zero, ReadBlob() returns
-% zero and has no other results. If length is greater than SSIZE_MAX, the
+% zero and has no other results. If length is greater than LONG_MAX, the
% result is unspecified.
%
% The format of the ReadBlob method is:
@@ -4751,7 +4751,7 @@ MagickExport signed short ReadBlobSignedShort(Image *image)
% returns a pointer to the data buffer you supply or to the image memory
% buffer if its supported (zero-copy). If length is zero, ReadBlobStream()
% returns a count of zero and has no other results. If length is greater than
-% SSIZE_MAX, the result is unspecified.
+% LONG_MAX, the result is unspecified.
%
% The format of the ReadBlobStream method is:
%
@@ -4984,8 +4984,8 @@ MagickExport MagickOffsetType SeekBlob(Image *image,
}
case SEEK_CUR:
{
- if (((offset > 0) && (blob_info->offset > (SSIZE_MAX-offset))) ||
- ((offset < 0) && (blob_info->offset < (-SSIZE_MAX-offset))))
+ if (((offset > 0) && (blob_info->offset > (LONG_MAX-offset))) ||
+ ((offset < 0) && (blob_info->offset < (LONG_MIN-offset))))
{
errno=EOVERFLOW;
return(-1);
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 6076f19ca..8a58f0c0d 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -225,9 +225,9 @@ MagickPrivate Cache AcquirePixelCache(const size_t number_threads)
value=DestroyString(value);
}
cache_info->width_limit=MagickMin(GetMagickResourceLimit(WidthResource),
- (MagickSizeType) SSIZE_MAX);
+ (MagickSizeType) LONG_MAX);
cache_info->height_limit=MagickMin(GetMagickResourceLimit(HeightResource),
- (MagickSizeType) SSIZE_MAX);
+ (MagickSizeType) LONG_MAX);
cache_info->semaphore=AcquireSemaphoreInfo();
cache_info->reference_count=1;
cache_info->file_semaphore=AcquireSemaphoreInfo();
@@ -3564,10 +3564,10 @@ static inline MagickOffsetType WritePixelCacheRegion(
{
#if !defined(MAGICKCORE_HAVE_PWRITE)
count=write(cache_info->file,buffer+i,(size_t) MagickMin(length-i,(size_t)
- SSIZE_MAX));
+ LONG_MAX));
#else
count=pwrite(cache_info->file,buffer+i,(size_t) MagickMin(length-i,(size_t)
- SSIZE_MAX),offset+i);
+ LONG_MAX),offset+i);
#endif
if (count <= 0)
{
@@ -4387,10 +4387,10 @@ static inline MagickOffsetType ReadPixelCacheRegion(
{
#if !defined(MAGICKCORE_HAVE_PREAD)
count=read(cache_info->file,buffer+i,(size_t) MagickMin(length-i,(size_t)
- SSIZE_MAX));
+ LONG_MAX));
#else
count=pread(cache_info->file,buffer+i,(size_t) MagickMin(length-i,(size_t)
- SSIZE_MAX),offset+i);
+ LONG_MAX),offset+i);
#endif
if (count <= 0)
{
@@ -5018,9 +5018,9 @@ static inline void PrefetchPixelCacheNexusPixels(const NexusInfo *nexus_info,
static inline MagickBooleanType ValidatePixelOffset(const ssize_t x,
const ssize_t a)
{
- if ((x >= 0) && (a > ((ssize_t) SSIZE_MAX-x)))
+ if ((x >= 0) && (a > (ssize_t) (LONG_MAX-x)))
return(MagickFalse);
- if (a < -((ssize_t) SSIZE_MAX-x))
+ if (a < (ssize_t) (LONG_MIN-x))
return(MagickFalse);
return(MagickTrue);
}
diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 8bf197c6f..028d54f31 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -162,7 +162,7 @@ static inline MagickOffsetType dpc_read(int file,const MagickSizeType length,
for (i=0; i < (MagickOffsetType) length; i+=count)
{
count=recv(file,CHAR_TYPE_CAST message+i,(LENGTH_TYPE) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX),0);
+ (MagickSizeType) LONG_MAX),0);
if (count <= 0)
{
count=0;
@@ -442,7 +442,7 @@ static inline MagickOffsetType dpc_send(int file,const MagickSizeType length,
for (i=0; i < (MagickOffsetType) length; i+=count)
{
count=(MagickOffsetType) send(file,CHAR_TYPE_CAST message+i,(LENGTH_TYPE)
- MagickMin(length-i,(MagickSizeType) SSIZE_MAX),MSG_NOSIGNAL);
+ MagickMin(length-i,(MagickSizeType) LONG_MAX),MSG_NOSIGNAL);
if (count <= 0)
{
count=0;
@@ -1236,7 +1236,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCacheMetacontent(
assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(metacontent != (unsigned char *) NULL);
- if (length > (MagickSizeType) SSIZE_MAX)
+ if (length > (MagickSizeType) LONG_MAX)
return(-1);
p=message;
*p++='R';
@@ -1311,7 +1311,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCachePixels(
assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(pixels != (unsigned char *) NULL);
- if (length > (MagickSizeType) SSIZE_MAX)
+ if (length > (MagickSizeType) LONG_MAX)
return(-1);
p=message;
*p++='r';
@@ -1447,7 +1447,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCacheMetacontent(
assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(metacontent != (unsigned char *) NULL);
- if (length > (MagickSizeType) SSIZE_MAX)
+ if (length > (MagickSizeType) LONG_MAX)
return(-1);
p=message;
*p++='W';
@@ -1523,7 +1523,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCachePixels(
assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(pixels != (const unsigned char *) NULL);
- if (length > (MagickSizeType) SSIZE_MAX)
+ if (length > (MagickSizeType) LONG_MAX)
return(-1);
p=message;
*p++='w';
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 1729b8efe..11b7bf3a7 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -2314,8 +2314,8 @@ static inline double GetDrawValue(const char *magick_restrict string,
q=sentinal;
value=InterpretLocaleValue(string,q);
- if ((IsNaN(value) != 0) || (value < -((double) SSIZE_MAX-512.0)) ||
- (value > ((double) SSIZE_MAX-512.0)))
+ if ((IsNaN(value) != 0) || (value < -((double) LONG_MAX-512.0)) ||
+ (value > ((double) LONG_MAX-512.0)))
return(0.0);
sentinal=q;
return(value);
@@ -6271,7 +6271,7 @@ static MagickBooleanType TraceBezier(MVGInfo *mvg_info,
for (j=i+1; j < (ssize_t) number_coordinates; j++)
{
alpha=fabs(primitive_info[j].point.x-primitive_info[i].point.x);
- if (alpha > (double) SSIZE_MAX)
+ if (alpha > (double) LONG_MAX)
{
(void) ThrowMagickException(mvg_info->exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'","");
@@ -6280,7 +6280,7 @@ static MagickBooleanType TraceBezier(MVGInfo *mvg_info,
if (alpha > (double) quantum)
quantum=(size_t) alpha;
alpha=fabs(primitive_info[j].point.y-primitive_info[i].point.y);
- if (alpha > (double) SSIZE_MAX)
+ if (alpha > (double) LONG_MAX)
{
(void) ThrowMagickException(mvg_info->exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'","");
diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h
index bb2ce7921..b17823b1b 100644
--- a/MagickCore/image-private.h
+++ b/MagickCore/image-private.h
@@ -54,10 +54,10 @@ static inline ssize_t CastDoubleToLong(const double value)
{
if (IsNaN(value) != 0)
return(0);
- if (value > (double) SSIZE_MAX)
- return((ssize_t) SSIZE_MAX);
- if (value < (double) -SSIZE_MAX)
- return((ssize_t) -SSIZE_MAX);
+ if (value > (double) LONG_MAX)
+ return((ssize_t) LONG_MAX);
+ if (value < (double) LONG_MIN)
+ return((ssize_t) LONG_MIN);
return((ssize_t) value);
}
diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c
index be92f9883..c06d8bd0f 100644
--- a/MagickCore/matrix.c
+++ b/MagickCore/matrix.c
@@ -152,10 +152,10 @@ static inline MagickOffsetType WriteMatrixElements(
{
#if !defined(MAGICKCORE_HAVE_PWRITE)
count=write(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX));
+ (MagickSizeType) LONG_MAX));
#else
count=pwrite(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX),(off_t) (offset+i));
+ (MagickSizeType) LONG_MAX),(off_t) (offset+i));
#endif
if (count <= 0)
{
@@ -684,10 +684,10 @@ static inline MagickOffsetType ReadMatrixElements(
{
#if !defined(MAGICKCORE_HAVE_PREAD)
count=read(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX));
+ (MagickSizeType) LONG_MAX));
#else
count=pread(matrix_info->file,buffer+i,(size_t) MagickMin(length-i,
- (MagickSizeType) SSIZE_MAX),(off_t) (offset+i));
+ (MagickSizeType) LONG_MAX),(off_t) (offset+i));
#endif
if (count <= 0)
{
diff --git a/MagickCore/memory.c b/MagickCore/memory.c
index 121fa6436..ac846c688 100644
--- a/MagickCore/memory.c
+++ b/MagickCore/memory.c
@@ -1035,7 +1035,7 @@ MagickExport size_t GetMaxMemoryRequest(void)
value=DestroyString(value);
}
}
- return(MagickMin(max_memory_request,SSIZE_MAX));
+ return(MagickMin(max_memory_request,LONG_MAX));
}
/*
diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index adb3fc883..57b366b22 100644
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -55,13 +55,6 @@ extern "C" {
#define _SC_PAGE_SIZE 1
#define _SC_PHYS_PAGES 2
#define _SC_OPEN_MAX 3
-#if !defined(SSIZE_MAX)
-# ifdef _WIN64
-# define SSIZE_MAX LLONG_MAX
-# else
-# define SSIZE_MAX LONG_MAX
-# endif
-#endif
/*
_MSC_VER values:
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 1b110a58b..fa4b2b988 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4456,10 +4456,10 @@ static inline void CatromWeights(const double x,double (*weights)[4])
static inline double ConstrainPixelOffset(double x)
{
- if (x < (double) -(SSIZE_MAX-512))
- return((double) -(SSIZE_MAX-512));
- if (x > (double) (SSIZE_MAX-512))
- return((double) (SSIZE_MAX-512));
+ if (x < (double) -(LONG_MAX-512))
+ return((double) -(LONG_MAX-512));
+ if (x > (double) (LONG_MAX-512))
+ return((double) (LONG_MAX-512));
return(x);
}
diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index c1dff2cbe..55c39c710 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -126,8 +126,8 @@ static ResourceInfo
MagickULLConstant(0), /* initial thread */
MagickULLConstant(0), /* initial throttle */
MagickULLConstant(0), /* initial time */
- SSIZE_MAX/sizeof(Quantum)/MaxPixelChannels/2, /* width limit */
- SSIZE_MAX/sizeof(Quantum)/MaxPixelChannels/2, /* height limit */
+ LONG_MAX/sizeof(Quantum)/MaxPixelChannels/2, /* width limit */
+ LONG_MAX/sizeof(Quantum)/MaxPixelChannels/2, /* height limit */
MagickResourceInfinity, /* list length limit */
MagickULLConstant(3072)*1024*1024, /* area limit */
MagickULLConstant(1536)*1024*1024, /* memory limit */
@@ -1418,7 +1418,7 @@ MagickExport MagickBooleanType SetMagickResourceLimit(const ResourceType type,
resource_info.height_limit=MagickMin(limit,StringToMagickSizeType(
value,100.0));
resource_info.height_limit=MagickMin(resource_info.height_limit,
- (MagickSizeType) SSIZE_MAX);
+ (MagickSizeType) LONG_MAX);
break;
}
case ListLengthResource:
@@ -1496,7 +1496,7 @@ MagickExport MagickBooleanType SetMagickResourceLimit(const ResourceType type,
resource_info.width_limit=MagickMin(limit,StringToMagickSizeType(value,
100.0));
resource_info.width_limit=MagickMin(resource_info.width_limit,
- (MagickSizeType) SSIZE_MAX);
+ (MagickSizeType) LONG_MAX);
break;
}
default:
diff --git a/MagickCore/string.c b/MagickCore/string.c
index e411caa3d..9572e336b 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -613,7 +613,7 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename)
for (i=0; i < length; i+=count)
{
count=read(file,string+i,(size_t) MagickMin(length-i,(size_t)
- SSIZE_MAX));
+ LONG_MAX));
if (count <= 0)
{
count=0;
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 3fce4d2b0..88990eb2a 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -769,10 +769,10 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
static inline double ConstrainPixelOffset(double x)
{
- if (x < (double) -(SSIZE_MAX-512))
- return((double) -(SSIZE_MAX-512));
- if (x > (double) (SSIZE_MAX-512))
- return((double) (SSIZE_MAX-512));
+ if (x < (double) -(LONG_MAX-512))
+ return((double) -(LONG_MAX-512));
+ if (x > (double) (LONG_MAX-512))
+ return((double) (LONG_MAX-512));
return(x);
}
diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index d14c97bb8..d9eb1f9bd 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -696,7 +696,7 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent)
(void) lseek(file,0,SEEK_SET);
for (i=0; i < length; i+=count)
{
- count=read(file,xml+i,(size_t) MagickMin(length-i,(size_t) SSIZE_MAX));
+ count=read(file,xml+i,(size_t) MagickMin(length-i,(size_t) LONG_MAX));
if (count <= 0)
{
count=0;
diff --git a/coders/ashlar.c b/coders/ashlar.c
index 9e6b1e116..02710fc98 100644
--- a/coders/ashlar.c
+++ b/coders/ashlar.c
@@ -283,9 +283,9 @@ static TileInfo AssignBestTileLocation(AshlarInfo *ashlar_info,
tile.y=0;
return(tile);
}
- tile.x=(ssize_t) SSIZE_MAX;
- tile.y=(ssize_t) SSIZE_MAX;
- min_excess=(ssize_t) SSIZE_MAX;
+ tile.x=(ssize_t) LONG_MAX;
+ tile.y=(ssize_t) LONG_MAX;
+ min_excess=(ssize_t) LONG_MAX;
node=ashlar_info->current;
previous=(&ashlar_info->current);
while ((width+node->x) <= ashlar_info->width)
@@ -472,8 +472,8 @@ static MagickBooleanType PackAshlarTiles(AshlarInfo *ashlar_info,
tiles[i].y=(ssize_t) tile_info.y;
if (tile_info.previous == (NodeInfo **) NULL)
{
- tiles[i].x=(ssize_t) SSIZE_MAX;
- tiles[i].y=(ssize_t) SSIZE_MAX;
+ tiles[i].x=(ssize_t) LONG_MAX;
+ tiles[i].y=(ssize_t) LONG_MAX;
}
}
}
@@ -481,8 +481,8 @@ static MagickBooleanType PackAshlarTiles(AshlarInfo *ashlar_info,
status=MagickTrue;
for (i=0; i < (ssize_t) number_tiles; i++)
{
- tiles[i].order=(ssize_t) ((tiles[i].x != (ssize_t) SSIZE_MAX) ||
- (tiles[i].y != (ssize_t) SSIZE_MAX) ? 1 : 0);
+ tiles[i].order=(ssize_t) ((tiles[i].x != (ssize_t) LONG_MAX) ||
+ (tiles[i].y != (ssize_t) LONG_MAX) ? 1 : 0);
if (tiles[i].order == 0)
status=MagickFalse;
}
@@ -606,7 +606,7 @@ static MagickBooleanType WriteASHLARImage(const ImageInfo *image_info,
ashlar_info.head.y=0;
ashlar_info.head.next=(&ashlar_info.sentinal);
ashlar_info.sentinal.x=(ssize_t) geometry.width;
- ashlar_info.sentinal.y=(ssize_t) SSIZE_MAX;
+ ashlar_info.sentinal.y=(ssize_t) LONG_MAX;
ashlar_info.sentinal.next=(NodeInfo *) NULL;
status=PackAshlarTiles(&ashlar_info,tiles,(size_t) n);
if (status != MagickFalse)
@@ -623,8 +623,8 @@ static MagickBooleanType WriteASHLARImage(const ImageInfo *image_info,
Image
*tile_image;
- if ((tiles[i].x == (ssize_t) SSIZE_MAX) ||
- (tiles[i].y == (ssize_t) SSIZE_MAX))
+ if ((tiles[i].x == (ssize_t) LONG_MAX) ||
+ (tiles[i].y == (ssize_t) LONG_MAX))
continue;
tile_image=ResizeImage(GetImageFromList(image,tiles[i].id),(size_t)
(tiles[i].width-2*geometry.x),(size_t) (tiles[i].height-2*geometry.y),
diff --git a/coders/heic.c b/coders/heic.c
index 13316dd15..7910247ca 100644
--- a/coders/heic.c
+++ b/coders/heic.c
@@ -416,7 +416,7 @@ static Image *ReadHEICImage(const ImageInfo *image_info,
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
return(DestroyImageList(image));
- if (GetBlobSize(image) > (MagickSizeType) SSIZE_MAX)
+ if (GetBlobSize(image) > (MagickSizeType) LONG_MAX)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
length=(size_t) GetBlobSize(image);
file_data=AcquireMagickMemory(length);
diff --git a/coders/tiff.c b/coders/tiff.c
index 2ca7cd9b9..92d30724a 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -254,8 +254,8 @@ static MagickOffsetType TIFFSeekCustomStream(const MagickOffsetType offset,
}
case SEEK_CUR:
{
- if (((offset > 0) && (profile->offset > (SSIZE_MAX-offset))) ||
- ((offset < 0) && (profile->offset < (-SSIZE_MAX-offset))))
+ if (((offset > 0) && (profile->offset > (LONG_MAX-offset))) ||
+ ((offset < 0) && (profile->offset < (LONG_MIN-offset))))
{
errno=EOVERFLOW;
return(-1);