diff options
| author | Cristy <mikayla-grace@urban-warrior.org> | 2021-01-02 16:38:49 -0500 |
|---|---|---|
| committer | Cristy <mikayla-grace@urban-warrior.org> | 2021-01-02 16:38:58 -0500 |
| commit | 7b7390a626ce78f40919b1bcee508d44e303236d (patch) | |
| tree | 6b8bb5acc676ee6fded05851bf27ddac77fadc34 | |
| parent | 4d33122af1c9905c8e9eb6c946d70abb12dfee3a (diff) | |
| download | ImageMagick-7b7390a626ce78f40919b1bcee508d44e303236d.tar.gz | |
cosmetic
| -rw-r--r-- | MagickCore/cache.c | 12 | ||||
| -rw-r--r-- | MagickCore/constitute.c | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/MagickCore/cache.c b/MagickCore/cache.c index d3e3d9538..e2feef51e 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -5015,12 +5015,12 @@ static inline void PrefetchPixelCacheNexusPixels(const NexusInfo *nexus_info, MagickCachePrefetch((unsigned char *) nexus_info->pixels+CACHE_LINE_SIZE,1,1); } -static inline MagickBooleanType ValidatePixelInterval(const ssize_t x, - const size_t a) +static inline MagickBooleanType ValidatePixelOffset(const ssize_t x, + const ssize_t a) { - if ((x >= 0) && (x >= (SSIZE_MAX-(ssize_t) a))) + if ((x >= 0) && (a > ((ssize_t) SSIZE_MAX-x))) return(MagickFalse); - if (x <= -(SSIZE_MAX-(ssize_t) a)) + if (a < (((ssize_t) -SSIZE_MAX)-x)) return(MagickFalse); return(MagickTrue); } @@ -5052,8 +5052,8 @@ static Quantum *SetPixelCacheNexusPixels( } if (((MagickSizeType) width > cache_info->width_limit) || ((MagickSizeType) height > cache_info->height_limit) || - (ValidatePixelInterval(x,(ssize_t) width) == MagickFalse) || - (ValidatePixelInterval(y,(ssize_t) height) == MagickFalse)) + (ValidatePixelOffset(x,(ssize_t) width) == MagickFalse) || + (ValidatePixelOffset(y,(ssize_t) height) == MagickFalse)) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, "WidthOrHeightExceedsLimit","`%s'",cache_info->filename); diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index 7bd251060..5ae318e7e 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -1012,7 +1012,6 @@ MagickExport Image *ReadInlineImage(const ImageInfo *image_info, for (p=content; (*p != ',') && (*p != '\0'); p++) ; if (*p == '\0') ThrowReaderException(CorruptImageError,"CorruptImage"); - length=0; blob=Base64Decode(++p,&length); if (length == 0) { |