components/imagemagick/patches/CVE-2014-2030.patch
author John Beck <John.Beck@Oracle.COM>
Wed, 12 Mar 2014 10:08:26 -0700
branchs11-update
changeset 2985 8d0f13e7dd0c
permissions -rw-r--r--
18331784 problem in UTILITY/IMAGEMAGICK
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2985
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
# This comes from upstream:
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
# http://trac.imagemagick.org/changeset/13736
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
# linked from:
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
# https://bugzilla.redhat.com/show_bug.cgi?id=1064098
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
--- ImagMagick-6.8.3/coders/psd.c	2014-03-03 07:57:25.334035665 -0800
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
+++ ImagMagick-6.8.3/coders/psd.c	2014-03-03 08:02:05.371109695 -0800
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
@@ -2107,9 +2107,6 @@
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
   StringInfo
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
     *bim_profile;
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
 
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
-  unsigned char
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
-    layer_name[4];
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
-
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
   /*
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
     Open image file.
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    17
   */
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    18
@@ -2367,12 +2364,15 @@
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    19
         property=(const char *) GetImageProperty(next_image,"label");
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    20
         if (property == (const char *) NULL)
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    21
           {
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    22
+            char
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    23
+              layer_name[MaxTextExtent];
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    24
+
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    25
             (void) WriteBlobMSBLong(image,16);
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    26
             (void) WriteBlobMSBLong(image,0);
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    27
             (void) WriteBlobMSBLong(image,0);
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    28
-            (void) FormatLocaleString((char *) layer_name,MaxTextExtent,
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    29
-              "L%06ld",(long) layer_count++);
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    30
-            WritePascalString( image, (char*)layer_name, 4 );
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    31
+            (void) FormatLocaleString(layer_name,MaxTextExtent,"L%06ld",(long)
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    32
+              layer_count++);
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    33
+            WritePascalString(image,layer_name,4);
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    34
           }
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    35
         else
8d0f13e7dd0c 18331784 problem in UTILITY/IMAGEMAGICK
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    36
           {