components/subversion/patches/002-CVE-2013-1849.patch
branchs11-update
changeset 2922 a20504fc0f7b
equal deleted inserted replaced
2921:8da1e7689d13 2922:a20504fc0f7b
       
     1 # CVE-2013-1849
       
     2 # http://subversion.apache.org/security/CVE-2013-1849-advisory.txt
       
     3 
       
     4 --- subversion/mod_dav_svn/liveprops.c	2012-02-03 12:04:00.000000000 -0800
       
     5 +++ subversion/mod_dav_svn/liveprops.c	2014-01-22 09:29:53.399158026 -0800
       
     6 @@ -429,7 +429,8 @@
       
     7          svn_filesize_t len = 0;
       
     8  
       
     9          /* our property, but not defined on collection resources */
       
    10 -        if (resource->collection || resource->baselined)
       
    11 +        if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY ||
       
    12 +            resource->collection || resource->baselined)
       
    13            return DAV_PROP_INSERT_NOTSUPP;
       
    14  
       
    15          serr = svn_fs_file_length(&len, resource->info->root.root,
       
    16 @@ -453,7 +454,9 @@
       
    17          svn_string_t *pval;
       
    18          const char *mime_type = NULL;
       
    19  
       
    20 -        if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
       
    21 +        if ((resource->type == DAV_RESOURCE_TYPE_ACTIVITY) ||
       
    22 +            (resource->baselined &&
       
    23 +             resource->type == DAV_RESOURCE_TYPE_VERSION))
       
    24            return DAV_PROP_INSERT_NOTSUPP;
       
    25  
       
    26          if (resource->type == DAV_RESOURCE_TYPE_PRIVATE