diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch deleted file mode 100644 index 88bd25e0d9..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Index: subversion/mod_dav_svn/repos.c | ||
4 | =================================================================== | ||
5 | --- a/subversion/mod_dav_svn/repos.c (revision 1503527) | ||
6 | +++ b/subversion/mod_dav_svn/repos.c (revision 1503528) | ||
7 | @@ -2408,21 +2408,12 @@ | ||
8 | svn_boolean_t is_urlpath, | ||
9 | apr_pool_t *pool) | ||
10 | { | ||
11 | - apr_size_t len; | ||
12 | - char *tmp = apr_pstrdup(pool, path); | ||
13 | - | ||
14 | - len = strlen(tmp); | ||
15 | - | ||
16 | - if (len > 0) | ||
17 | + if (*path != '\0') /* not an empty string */ | ||
18 | { | ||
19 | - /* Remove any trailing slash; else svn_path_dirname() asserts. */ | ||
20 | - if (tmp[len-1] == '/') | ||
21 | - tmp[len-1] = '\0'; | ||
22 | - | ||
23 | if (is_urlpath) | ||
24 | - return svn_urlpath__dirname(tmp, pool); | ||
25 | + return svn_urlpath__dirname(path, pool); | ||
26 | else | ||
27 | - return svn_fspath__dirname(tmp, pool); | ||
28 | + return svn_fspath__dirname(path, pool); | ||
29 | } | ||
30 | |||
31 | return path; | ||
32 | @@ -2458,7 +2449,9 @@ | ||
33 | parent->versioned = 1; | ||
34 | parent->hooks = resource->hooks; | ||
35 | parent->pool = resource->pool; | ||
36 | - parent->uri = get_parent_path(resource->uri, TRUE, resource->pool); | ||
37 | + parent->uri = get_parent_path(svn_urlpath__canonicalize(resource->uri, | ||
38 | + resource->pool), | ||
39 | + TRUE, resource->pool); | ||
40 | parent->info = parentinfo; | ||
41 | |||
42 | parentinfo->uri_path = | ||