From: Cristy Date: Mon, 3 Jul 2017 00:35:30 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.6-1~86 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38b03f97fe5125ea5fed60c2d645e690b9a6777a;p=imagemagick ... --- diff --git a/coders/jpeg.c b/coders/jpeg.c index 4cb88e95a..2d1be58a9 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -1062,12 +1062,10 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, return((Image *) NULL); } /* - Verify that file size large enough to contain a JPEG datastream - if using a seekable blob + Verify that file size large enough to contain a JPEG datastream. */ - if (IsBlobSeekable(image) && GetBlobSize(image) < 107) + if (GetBlobSize(image) < 107) ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile"); - /* Initialize JPEG parameters. */ @@ -1535,6 +1533,7 @@ ModuleExport size_t RegisterJPEGImage(void) entry->encoder=(EncodeImageHandler *) WriteJPEGImage; #endif entry->magick=(IsImageFormatHandler *) IsJPEG; + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderUseExtensionFlag; if (*version != '\0') @@ -1550,6 +1549,7 @@ ModuleExport size_t RegisterJPEGImage(void) entry->encoder=(EncodeImageHandler *) WriteJPEGImage; #endif entry->magick=(IsImageFormatHandler *) IsJPEG; + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; if (*version != '\0') entry->version=ConstantString(version); @@ -1563,6 +1563,7 @@ ModuleExport size_t RegisterJPEGImage(void) entry->decoder=(DecodeImageHandler *) ReadJPEGImage; entry->encoder=(EncodeImageHandler *) WriteJPEGImage; #endif + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderUseExtensionFlag; if (*version != '\0') @@ -1577,6 +1578,7 @@ ModuleExport size_t RegisterJPEGImage(void) entry->decoder=(DecodeImageHandler *) ReadJPEGImage; entry->encoder=(EncodeImageHandler *) WriteJPEGImage; #endif + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderUseExtensionFlag; if (*version != '\0') @@ -1591,6 +1593,7 @@ ModuleExport size_t RegisterJPEGImage(void) entry->decoder=(DecodeImageHandler *) ReadJPEGImage; entry->encoder=(EncodeImageHandler *) WriteJPEGImage; #endif + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderUseExtensionFlag; if (*version != '\0')