From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 4 Apr 2016 20:22:30 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/161
X-Git-Tag: 7.0.1-0~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6c70bb24e8ce03432af9d2149664c46895d17d9;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/161
---

diff --git a/coders/icon.c b/coders/icon.c
index 11307abe9..6cb5532de 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -308,12 +308,10 @@ static Image *ReadICONImage(const ImageInfo *image_info,
     icon_file.directory[i].size=ReadBlobLSBLong(image);
     icon_file.directory[i].offset=ReadBlobLSBLong(image);
     if (EOFBlob(image) != MagickFalse)
-      {
-        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
-          image->filename);
-        break;
-      }
+      break;
   }
+  if (EOFBlob(image) != MagickFalse)
+    ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile");
   one=1;
   for (i=0; i < icon_file.count; i++)
   {