components/imagemagick/patches/CVE-2014-2030.patch
branchs11-update
changeset 2985 8d0f13e7dd0c
equal deleted inserted replaced
2983:7e65e1db2593 2985:8d0f13e7dd0c
       
     1 # This comes from upstream:
       
     2 # http://trac.imagemagick.org/changeset/13736
       
     3 # linked from:
       
     4 # https://bugzilla.redhat.com/show_bug.cgi?id=1064098
       
     5 
       
     6 --- ImagMagick-6.8.3/coders/psd.c	2014-03-03 07:57:25.334035665 -0800
       
     7 +++ ImagMagick-6.8.3/coders/psd.c	2014-03-03 08:02:05.371109695 -0800
       
     8 @@ -2107,9 +2107,6 @@
       
     9    StringInfo
       
    10      *bim_profile;
       
    11  
       
    12 -  unsigned char
       
    13 -    layer_name[4];
       
    14 -
       
    15    /*
       
    16      Open image file.
       
    17    */
       
    18 @@ -2367,12 +2364,15 @@
       
    19          property=(const char *) GetImageProperty(next_image,"label");
       
    20          if (property == (const char *) NULL)
       
    21            {
       
    22 +            char
       
    23 +              layer_name[MaxTextExtent];
       
    24 +
       
    25              (void) WriteBlobMSBLong(image,16);
       
    26              (void) WriteBlobMSBLong(image,0);
       
    27              (void) WriteBlobMSBLong(image,0);
       
    28 -            (void) FormatLocaleString((char *) layer_name,MaxTextExtent,
       
    29 -              "L%06ld",(long) layer_count++);
       
    30 -            WritePascalString( image, (char*)layer_name, 4 );
       
    31 +            (void) FormatLocaleString(layer_name,MaxTextExtent,"L%06ld",(long)
       
    32 +              layer_count++);
       
    33 +            WritePascalString(image,layer_name,4);
       
    34            }
       
    35          else
       
    36            {