ssize_t
count,
horizontal_factor,
- quantum,
vertical_factor,
y;
+ size_t
+ length,
+ quantum;
+
unsigned char
*scanline;
(size_t) quantum*sizeof(*scanline));
if (scanline == (unsigned char *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ status=MagickTrue;
do
{
chroma_image=CloneImage(image,(image->columns+horizontal_factor-1)/
if (interlace == NoInterlace)
{
if ((y > 0) || (GetPreviousImageInList(image) == (Image *) NULL))
- count=ReadBlob(image,(size_t) (2*quantum*image->columns),scanline);
+ {
+ length=2*quantum*image->columns;
+ count=ReadBlob(image,length,scanline);
+ if (count != (ssize_t) length)
+ {
+ status=MagickFalse;
+ ThrowFileException(exception,CorruptImageError,
+ "UnexpectedEndOfFile",image->filename);
+ break;
+ }
+ }
p=scanline;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
else
{
if ((y > 0) || (GetPreviousImageInList(image) == (Image *) NULL))
- count=ReadBlob(image,(size_t) quantum*image->columns,scanline);
+ {
+ length=quantum*image->columns;
+ count=ReadBlob(image,length,scanline);
+ if (count != (ssize_t) length)
+ {
+ status=MagickFalse;
+ ThrowFileException(exception,CorruptImageError,
+ "UnexpectedEndOfFile",image->filename);
+ break;
+ }
+ }
p=scanline;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
{
for (y=0; y < (ssize_t) chroma_image->rows; y++)
{
- count=ReadBlob(image,(size_t) quantum*chroma_image->columns,scanline);
+ length=quantum*chroma_image->columns;
+ count=ReadBlob(image,length,scanline);
+ if (count != (ssize_t) length)
+ {
+ status=MagickFalse;
+ ThrowFileException(exception,CorruptImageError,
+ "UnexpectedEndOfFile",image->filename);
+ break;
+ }
p=scanline;
q=QueueAuthenticPixels(chroma_image,0,y,chroma_image->columns,1,
exception);
}
for (y=0; y < (ssize_t) chroma_image->rows; y++)
{
- count=ReadBlob(image,(size_t) quantum*chroma_image->columns,scanline);
+ length=quantum*chroma_image->columns;
+ count=ReadBlob(image,length,scanline);
+ if (count != (ssize_t) length)
+ {
+ status=MagickFalse;
+ ThrowFileException(exception,CorruptImageError,
+ "UnexpectedEndOfFile",image->filename);
+ break;
+ }
p=scanline;
q=GetAuthenticPixels(chroma_image,0,y,chroma_image->columns,1,
exception);
} while (count != 0);
scanline=(unsigned char *) RelinquishMagickMemory(scanline);
(void) CloseBlob(image);
+ if (status == MagickFalse)
+ return(DestroyImageList(image));
return(GetFirstImageInList(image));
}
\f