Commit a45bb709d for imagemagick.org
commit a45bb709d9f73d233832813917519ec6f7ccc7c0
Author: Cristy <urban-warrior@imagemagick.org>
Date: Wed Mar 4 22:37:11 2026 -0500
correct calculation
diff --git a/coders/uhdr.c b/coders/uhdr.c
index 5ac9e3043..5efd5a3f7 100644
--- a/coders/uhdr.c
+++ b/coders/uhdr.c
@@ -625,8 +625,7 @@ static MagickBooleanType WriteUHDRImage(const ImageInfo *image_info,
aligned_width;
size_t
- picSize,
- sans;
+ picSize;
void
*crBuffer = NULL, *cbBuffer = NULL, *yBuffer = NULL;
@@ -667,23 +666,26 @@ static MagickBooleanType WriteUHDRImage(const ImageInfo *image_info,
aligned_height = image->rows + (image->rows & 1);
if (HeapOverflowSanityCheckGetSize(aligned_width,aligned_height,&picSize) != MagickFalse)
{
- (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError,
- "ImproperImageHeader","%s",image->filename);
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ CorruptImageError,"ImproperImageHeader","%s",image->filename);
goto next_image;
}
if (HeapOverflowSanityCheckGetSize(picSize,bpp,&picSize) != MagickFalse)
{
- (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError,
- "ImproperImageHeader","%s",image->filename);
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ CorruptImageError,"ImproperImageHeader","%s",image->filename);
goto next_image;
}
- if ((bpp < 4) && (HeapOverflowSanityCheckGetSize(picSize,3,&sans) != MagickFalse))
+ if (bpp < 4)
{
- (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError,
- "ImproperImageHeader","%s",image->filename);
- goto next_image;
+ if (HeapOverflowSanityCheckGetSize(picSize,3,&picSize) != MagickFalse)
+ {
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ CorruptImageError,"ImproperImageHeader","%s",image->filename);
+ goto next_image;
+ }
+ picSize/=2;
}
- picSize=3*picSize/2;
if ((image->depth < hdrIntentMinDepth) && (image->depth != 8))
{