From 3e6ebf9fc5fe88a3ab51db3080ef65ee3734f0e9 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 9 Oct 2009 18:20:57 +0000 Subject: [PATCH] --- coders/dcm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/coders/dcm.c b/coders/dcm.c index c1c1ca366..307366a9d 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3363,7 +3363,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) signed_data=(unsigned long) (significant_bits == 16 ? 1 : 0); if ((strcmp(transfer_syntax,"1.2.840.10008.1.2.4.50") == 0) || (strcmp(transfer_syntax,"1.2.840.10008.1.2.4.70") == 0) || - (strcmp(transfer_syntax,"1.2.840.10008.1.2.4.90") == 0)) + (strcmp(transfer_syntax,"1.2.840.10008.1.2.4.90") == 0) || + (strcmp(transfer_syntax,"1.2.840.10008.1.2.4.91") == 0)) { Image *images; @@ -3456,11 +3457,11 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) fclose(file); (void) FormatMagickString(read_info->filename,MaxTextExtent, "jpeg:%s",filename); - if (strcmp(transfer_syntax,"1.2.840.10008.1.2.4.90") == 0) + if ((strcmp(transfer_syntax,"1.2.840.10008.1.2.4.90") == 0) || + (strcmp(transfer_syntax,"1.2.840.10008.1.2.4.91") == 0)) (void) FormatMagickString(read_info->filename,MaxTextExtent, "jp2:%s",filename); jpeg_image=ReadImage(read_info,exception); -puts("c"); if (jpeg_image != (Image *) NULL) { ResetImagePropertyIterator(image); @@ -3797,6 +3798,12 @@ puts("c"); if (status == MagickFalse) break; } + if (EOFBlob(image) != MagickFalse) + { + ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", + image->filename); + break; + } } /* Free resources. -- 2.50.1