]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/1179
authorCristy <urban-warrior@imagemagick.org>
Wed, 20 Jun 2018 22:04:36 +0000 (18:04 -0400)
committerCristy <urban-warrior@imagemagick.org>
Wed, 20 Jun 2018 22:04:36 +0000 (18:04 -0400)
coders/bgr.c
coders/cmyk.c
coders/gray.c
coders/rgb.c
coders/ycbcr.c
configure

index aecfca4343f8e894f83dc30bfb67e69eaab7a68b..04a03f74b6355d8e48abd98a0d9c6db72daf8b50 100644 (file)
@@ -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),
index e3ef431a13e9899a3e92bf65370d24c196974344..28e65b75b8adf4fe51514619bc444a987bceea97 100644 (file)
@@ -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),
index 487a2ce966a3d461bf8f3464d8eb987a13ddb7d3..4416260ea41f81f4cafad08e0e766c30d6d3093b 100644 (file)
@@ -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),
index 8e4c72a1063c3e3924e954d0ca2c5642746a0279..f4f28548f4ef9b0d887e10ceee3d36ba4470529e 100644 (file)
@@ -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),
index 1c323ef19ea9bf1d1265c1a20c98d2fb759d7dba..20a14b2ed82a3d63b6d5d0e2af9e5b1effd7ee3e 100644 (file)
@@ -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),
index 9bcdba84e420994fd1e2ea19e4dbc0dc8b8790b5..42d04a7749b676adce42a2ab12c058eeea645718 100755 (executable)
--- 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