https://github.com/ImageMagick/ImageMagick/issues/1600

diff --git a/coders/bmp.c b/coders/bmp.c
index fdabac95026ab325cc1b837491319540a6cd7ba0..c964834fe8874bfe18ca86792535789f537761c5 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1506,7 +1506,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if (GetNextImageInList(image) == (Image *) NULL)
           {
             status=MagickFalse;
-            return((Image *) NULL);
+            break;
           }
         image=SyncNextImageInList(image);
         status=SetImageProgress(image,LoadImagesTag,TellBlob(image),

diff --git a/coders/viff.c b/coders/viff.c
index 5f89ad15e305fcf0926b5a6390c1d43910342225..05aac7c55642c2beb73d4fe5b842d349e409bdc7 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -773,8 +773,8 @@ static Image *ReadVIFFImage(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),