]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Wed, 5 Oct 2011 01:47:42 +0000 (01:47 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Wed, 5 Oct 2011 01:47:42 +0000 (01:47 +0000)
coders/icon.c

index fa79c4b1537708a2c23bd77f5ac72810b6a13c74..0ed47e42e57aef3a70cfb5144b94e72846822d42 100644 (file)
@@ -288,12 +288,14 @@ static Image *ReadICONImage(const ImageInfo *image_info,
         icon_image=BlobToImage(read_info,png,length+12,exception);
         read_info=DestroyImageInfo(read_info);
         png=(unsigned char *) RelinquishMagickMemory(png);
-        if (icon_image != (Image *) NULL)
+        if (icon_image == (Image *) NULL)
           {
-            DestroyBlob(icon_image);
-            icon_image->blob=ReferenceBlob(image->blob);
-            ReplaceImageInList(&image,icon_image);
+            image=DestroyImageList(image);
+            return((Image *) NULL);
           }
+        DestroyBlob(icon_image);
+        icon_image->blob=ReferenceBlob(image->blob);
+        ReplaceImageInList(&image,icon_image);
       }
     else
       {