Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/libwmf/patches/libwmf-0.2.8.4-CVE-2015-4695.patch

    Annotation of /trunk/libwmf/patches/libwmf-0.2.8.4-CVE-2015-4695.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2938 - (hide annotations) (download)
    Tue May 30 10:46:40 2017 UTC (6 years, 11 months ago) by niro
    File size: 1813 byte(s) 
    -added a bunch of security patches
    1 niro 2938 --- libwmf-0.2.8.4/src/player/meta.h
    2     +++ libwmf-0.2.8.4/src/player/meta.h
    3     @@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
    4     objects = P->objects;
    5    
    6     i = 0;
    7     - while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
    8     + while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
    9    
    10     if (i == NUM_OBJECTS (API))
    11     { WMF_ERROR (API,"Object out of range!");
    12     @@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
    13     objects = P->objects;
    14    
    15     i = 0;
    16     - while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
    17     + while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
    18    
    19     if (i == NUM_OBJECTS (API))
    20     { WMF_ERROR (API,"Object out of range!");
    21     @@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API,
    22     objects = P->objects;
    23    
    24     i = 0;
    25     - while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
    26     + while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
    27    
    28     if (i == NUM_OBJECTS (API))
    29     { WMF_ERROR (API,"Object out of range!");
    30     @@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP
    31     objects = P->objects;
    32    
    33     i = 0;
    34     - while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
    35     + while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
    36    
    37     if (i == NUM_OBJECTS (API))
    38     { WMF_ERROR (API,"Object out of range!");
    39     @@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API
    40     objects = P->objects;
    41    
    42     i = 0;
    43     - while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
    44     + while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
    45    
    46     if (i == NUM_OBJECTS (API))
    47     { WMF_ERROR (API,"Object out of range!");
    48     @@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI*
    49     objects = P->objects;
    50    
    51     i = 0;
    52     - while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
    53     + while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
    54    
    55     if (i == NUM_OBJECTS (API))
    56     { WMF_ERROR (API,"Object out of range!");