From 5ff0db98101ff6098a7bc677a0845de793c093cf Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 20 Jun 2018 18:04:36 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1179 --- coders/bgr.c | 4 ++-- coders/cmyk.c | 4 ++-- coders/gray.c | 4 ++-- coders/rgb.c | 4 ++-- coders/ycbcr.c | 4 ++-- configure | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/coders/bgr.c b/coders/bgr.c index aecfca434..04a03f74b 100644 --- a/coders/bgr.c +++ b/coders/bgr.c @@ -982,8 +982,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, AcquireNextImage(image_info,image,exception); if (GetNextImageInList(image) == (Image *) NULL) { - image=DestroyImageList(image); - return((Image *) NULL); + status=MagickFalse; + break; } image=SyncNextImageInList(image); status=SetImageProgress(image,LoadImagesTag,TellBlob(image), diff --git a/coders/cmyk.c b/coders/cmyk.c index e3ef431a1..28e65b75b 100644 --- a/coders/cmyk.c +++ b/coders/cmyk.c @@ -1094,8 +1094,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, AcquireNextImage(image_info,image,exception); if (GetNextImageInList(image) == (Image *) NULL) { - image=DestroyImageList(image); - return((Image *) NULL); + status=MagickFalse; + break; } image=SyncNextImageInList(image); status=SetImageProgress(image,LoadImagesTag,TellBlob(image), diff --git a/coders/gray.c b/coders/gray.c index 487a2ce96..4416260ea 100644 --- a/coders/gray.c +++ b/coders/gray.c @@ -693,8 +693,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, AcquireNextImage(image_info,image,exception); if (GetNextImageInList(image) == (Image *) NULL) { - image=DestroyImageList(image); - return((Image *) NULL); + status=MagickFalse; + break; } image=SyncNextImageInList(image); status=SetImageProgress(image,LoadImagesTag,TellBlob(image), diff --git a/coders/rgb.c b/coders/rgb.c index 8e4c72a10..f4f28548f 100644 --- a/coders/rgb.c +++ b/coders/rgb.c @@ -967,8 +967,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) AcquireNextImage(image_info,image,exception); if (GetNextImageInList(image) == (Image *) NULL) { - image=DestroyImageList(image); - return((Image *) NULL); + status=MagickFalse; + break; } image=SyncNextImageInList(image); status=SetImageProgress(image,LoadImagesTag,TellBlob(image), diff --git a/coders/ycbcr.c b/coders/ycbcr.c index 1c323ef19..20a14b2ed 100644 --- a/coders/ycbcr.c +++ b/coders/ycbcr.c @@ -968,8 +968,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, AcquireNextImage(image_info,image,exception); if (GetNextImageInList(image) == (Image *) NULL) { - image=DestroyImageList(image); - return((Image *) NULL); + status=MagickFalse; + break; } image=SyncNextImageInList(image); status=SetImageProgress(image,LoadImagesTag,TellBlob(image), diff --git a/configure b/configure index 9bcdba84e..42d04a774 100755 --- a/configure +++ b/configure @@ -4555,7 +4555,7 @@ MAGICK_PATCHLEVEL_VERSION=3 MAGICK_VERSION=7.0.8-3 -MAGICK_GIT_REVISION=14479:c7d011f98:20180619 +MAGICK_GIT_REVISION=14484:07f0db63f:20180620 # Substitute library versioning -- 2.40.0