diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-1849.patch')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-1849.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-1849.patch b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-1849.patch new file mode 100644 index 0000000000..734f9b02e4 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-1849.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | --- a/subversion/mod_dav_svn/liveprops.c | ||
4 | +++ b/subversion/mod_dav_svn/liveprops.c | ||
5 | @@ -410,7 +410,8 @@ insert_prop(const dav_resource *resource | ||
6 | svn_filesize_t len = 0; | ||
7 | |||
8 | /* our property, but not defined on collection resources */ | ||
9 | - if (resource->collection || resource->baselined) | ||
10 | + if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY | ||
11 | + || resource->collection || resource->baselined) | ||
12 | return DAV_PROP_INSERT_NOTSUPP; | ||
13 | |||
14 | serr = svn_fs_file_length(&len, resource->info->root.root, | ||
15 | @@ -434,7 +435,9 @@ insert_prop(const dav_resource *resource | ||
16 | svn_string_t *pval; | ||
17 | const char *mime_type = NULL; | ||
18 | |||
19 | - if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION) | ||
20 | + if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY | ||
21 | + || (resource->baselined | ||
22 | + && resource->type == DAV_RESOURCE_TYPE_VERSION)) | ||
23 | return DAV_PROP_INSERT_NOTSUPP; | ||
24 | |||
25 | if (resource->type == DAV_RESOURCE_TYPE_PRIVATE | ||