| author | Charly Abraham <Charly.Abraham@oracle.COM> |
| Mon, 15 Jun 2015 03:17:29 -0700 | |
| branch | s11u2-sru |
| changeset 4481 | 9ee3f8d1c3c6 |
| parent 4000 | 3644abf7d157 |
| permissions | -rw-r--r-- |
|
4000
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
1 |
# CVE-2013-1849 |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
2 |
# http://subversion.apache.org/security/CVE-2013-1849-advisory.txt |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
3 |
|
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
4 |
--- subversion/mod_dav_svn/liveprops.c 2012-02-03 12:04:00.000000000 -0800 |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
5 |
+++ subversion/mod_dav_svn/liveprops.c 2014-01-22 09:29:53.399158026 -0800 |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
6 |
@@ -429,7 +429,8 @@ |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
7 |
svn_filesize_t len = 0; |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
8 |
|
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
9 |
/* our property, but not defined on collection resources */ |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
10 |
- if (resource->collection || resource->baselined) |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
11 |
+ if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY || |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
12 |
+ resource->collection || resource->baselined) |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
13 |
return DAV_PROP_INSERT_NOTSUPP; |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
14 |
|
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
15 |
serr = svn_fs_file_length(&len, resource->info->root.root, |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
16 |
@@ -453,7 +454,9 @@ |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
17 |
svn_string_t *pval; |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
18 |
const char *mime_type = NULL; |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
19 |
|
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
20 |
- if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION) |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
21 |
+ if ((resource->type == DAV_RESOURCE_TYPE_ACTIVITY) || |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
22 |
+ (resource->baselined && |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
23 |
+ resource->type == DAV_RESOURCE_TYPE_VERSION)) |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
24 |
return DAV_PROP_INSERT_NOTSUPP; |
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
25 |
|
|
3644abf7d157
backout 19476174/20673493 - needs more work
Gabriel Carrillo <gabriel.carrillo@oracle.com>
parents:
diff
changeset
|
26 |
if (resource->type == DAV_RESOURCE_TYPE_PRIVATE |