current/SOURCES/imagemagick-CVE-2014-2030.patch

Index: /ImageMagick/branches/ImageMagick-6/coders/psd.c
===================================================================
--- /ImageMagick/branches/ImageMagick-6/coders/psd.c    (revision 13684)
+++ /ImageMagick/branches/ImageMagick-6/coders/psd.c    (revision 13736)
@@ -2113,7 +2113,4 @@
     *bim_profile;
 
-  unsigned char
-    layer_name[4];
-
   /*
     Open image file.
@@ -2373,10 +2370,13 @@
         if (property == (const char *) NULL)
           {
+            char
+              layer_name[MaxTextExtent];
+
             (void) WriteBlobMSBLong(image,16);
             (void) WriteBlobMSBLong(image,0);
             (void) WriteBlobMSBLong(image,0);
-            (void) FormatLocaleString((char *) layer_name,MaxTextExtent,
-              "L%06ld",(long) layer_count++);
-            WritePascalString( image, (char*)layer_name, 4 );
+            (void) FormatLocaleString(layer_name,MaxTextExtent,"L%06ld",(long)
+              layer_count++);
+            WritePascalString(image,layer_name,4);
           }
         else
1	Index: /ImageMagick/branches/ImageMagick-6/coders/psd.c
2	===================================================================
3	--- /ImageMagick/branches/ImageMagick-6/coders/psd.c (revision 13684)
4	+++ /ImageMagick/branches/ImageMagick-6/coders/psd.c (revision 13736)
5	@@ -2113,7 +2113,4 @@
6	*bim_profile;
7
8	- unsigned char
9	- layer_name[4];
10	-
11	/*
12	Open image file.
13	@@ -2373,10 +2370,13 @@
14	if (property == (const char *) NULL)
15	{
16	+ char
17	+ layer_name[MaxTextExtent];
18	+
19	(void) WriteBlobMSBLong(image,16);
20	(void) WriteBlobMSBLong(image,0);
21	(void) WriteBlobMSBLong(image,0);
22	- (void) FormatLocaleString((char *) layer_name,MaxTextExtent,
23	- "L%06ld",(long) layer_count++);
24	- WritePascalString( image, (char*)layer_name, 4 );
25	+ (void) FormatLocaleString(layer_name,MaxTextExtent,"L%06ld",(long)
26	+ layer_count++);
27	+ WritePascalString(image,layer_name,4);
28	}
29	else