Changeset 1307

Timestamp:

02/27/10 10:22:16 (3 years ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• coders/icon.c (modified) (1 diff)

ImageMagick/trunk/ChangeLog

@@ +1 @@
+2010-02-27  6.6.0-1 Cristy  <quetzlzacatenango@image...>
+  * Check to see if ICON image width /height exceeds that of the image canvas.
+
 2010-02-21  6.6.0-0 Cristy  <quetzlzacatenango@image...>
   * Insufficient image data in EPT is a warning rather than an error.

ImageMagick/trunk/coders/icon.c

@@ -315 +315 @@
         image->matte=MagickTrue;
         image->columns=(unsigned long) icon_file.directory[i].width;
-        if (image->columns == 0)
+        if (image->columns > icon_info.width)
           image->columns=(unsigned long) icon_info.width;
         image->rows=(unsigned long) icon_file.directory[i].height;
-        if (image->rows == 0)
+        if (image->rows > icon_info.height)
           image->rows=(unsigned long) icon_info.height;
         image->depth=8;