From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 5 Jan 2015 22:42:52 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=995156fce3e61f5abb141526dbe707868a1c7a49;p=imagemagick

---

diff --git a/coders/icon.c b/coders/icon.c
index 50bfed63c..cdd143ff2 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -323,6 +323,12 @@ static Image *ReadICONImage(const ImageInfo *image_info,
     icon_info.height=(unsigned char) ((int) ReadBlobLSBLong(image)/2);
     icon_info.planes=ReadBlobLSBShort(image);
     icon_info.bits_per_pixel=ReadBlobLSBShort(image);
+    if (EOFBlob(image) != MagickFalse)
+      {
+        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+          image->filename);
+        break;
+      }
     if (((icon_info.planes == 18505) && (icon_info.bits_per_pixel == 21060)) || 
         (icon_info.size == 0x474e5089))
       {