]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Tue, 3 Jul 2018 00:19:53 +0000 (20:19 -0400)
committerCristy <urban-warrior@imagemagick.org>
Tue, 3 Jul 2018 00:19:53 +0000 (20:19 -0400)
coders/mpc.c
coders/txt.c

index a118d2a83212067b98142a515aa8933bc82f5a43..1a32695abd65af45be4433c45407fca5f281a9f2 100644 (file)
@@ -1011,8 +1011,8 @@ static Image *ReadMPCImage(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 64aef87508cefca6b48047a065e7997de63e7a40..d464813bb6fc78499fcc10702506246319324810 100644 (file)
@@ -321,8 +321,8 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,
     AcquireNextImage(image_info,image,exception);
     if (GetNextImageInList(image) == (Image *) NULL)
       {
-        image=DestroyImageList(image);
-        return((Image *) NULL);
+        status=MagickFalse;
+        break;
       }
     image->next->columns=image->columns;
     image->next->rows=image->rows;
@@ -349,6 +349,8 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,
     texture=DestroyImage(texture);
   draw_info=DestroyDrawInfo(draw_info);
   (void) CloseBlob(image);
+  if (status == MagickFalse)
+    return(DestroyImageList(image));
   return(GetFirstImageInList(image));
 }
 \f