Skip to content

Commit 91cac2d

Browse files
committed
Apply the fix for GHSA-7rgw-xg25-prjm.
1 parent 1638ab0 commit 91cac2d

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

coders/bgr.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -313,24 +313,24 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
313313
}
314314
for (y=0; y < (ssize_t) image->extract_info.height; y++)
315315
{
316-
const PixelPacket
317-
*magick_restrict p;
316+
for (i=0; i < (ssize_t) (image->matte != MagickFalse ? 4 : 3); i++)
317+
{
318+
const PixelPacket
319+
*magick_restrict p;
318320

319-
PixelPacket
320-
*magick_restrict q;
321+
PixelPacket
322+
*magick_restrict q;
321323

322-
ssize_t
323-
x;
324+
ssize_t
325+
x;
324326

325-
if (count != (ssize_t) length)
326-
{
327-
status=MagickFalse;
328-
ThrowFileException(exception,CorruptImageError,
329-
"UnexpectedEndOfFile",image->filename);
330-
break;
331-
}
332-
for (i=0; i < (ssize_t) (image->matte != MagickFalse ? 4 : 3); i++)
333-
{
327+
if (count != (ssize_t) length)
328+
{
329+
status=MagickFalse;
330+
ThrowFileException(exception,CorruptImageError,
331+
"UnexpectedEndOfFile",image->filename);
332+
break;
333+
}
334334
quantum_type=quantum_types[i];
335335
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
336336
exception);

0 commit comments

Comments
 (0)