|
 |
720190 |
# ./pullrev.sh 1667248
|
|
|
720190 |
|
|
|
720190 |
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2015-0251
|
|
|
720190 |
|
|
|
720190 |
http://svn.apache.org/viewvc?view=revision&revision=1667248
|
|
|
720190 |
|
|
|
720190 |
--- subversion-1.7.14/subversion/mod_dav_svn/deadprops.c
|
|
|
720190 |
+++ subversion-1.7.14/subversion/mod_dav_svn/deadprops.c
|
|
|
720190 |
@@ -160,6 +160,23 @@
|
|
|
720190 |
}
|
|
|
720190 |
|
|
|
720190 |
|
|
|
720190 |
+static svn_error_t *
|
|
|
720190 |
+change_txn_prop(svn_fs_txn_t *txn,
|
|
|
720190 |
+ const char *propname,
|
|
|
720190 |
+ const svn_string_t *value,
|
|
|
720190 |
+ apr_pool_t *scratch_pool)
|
|
|
720190 |
+{
|
|
|
720190 |
+ if (strcmp(propname, SVN_PROP_REVISION_AUTHOR) == 0)
|
|
|
720190 |
+ return svn_error_create(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
|
|
|
720190 |
+ "Attempted to modify 'svn:author' property "
|
|
|
720190 |
+ "on a transaction");
|
|
|
720190 |
+
|
|
|
720190 |
+ SVN_ERR(svn_repos_fs_change_txn_prop(txn, propname, value, scratch_pool));
|
|
|
720190 |
+
|
|
|
720190 |
+ return SVN_NO_ERROR;
|
|
|
720190 |
+}
|
|
|
720190 |
+
|
|
|
720190 |
+
|
|
|
720190 |
static dav_error *
|
|
|
720190 |
save_value(dav_db *db, const dav_prop_name *name,
|
|
|
720190 |
const svn_string_t *const *old_value_p,
|
|
|
720190 |
@@ -210,9 +227,8 @@
|
|
|
720190 |
{
|
|
|
720190 |
if (db->resource->working)
|
|
|
720190 |
{
|
|
|
720190 |
- serr = svn_repos_fs_change_txn_prop(resource->info->root.txn,
|
|
|
720190 |
- propname, value,
|
|
|
720190 |
- subpool);
|
|
|
720190 |
+ serr = change_txn_prop(resource->info->root.txn, propname,
|
|
|
720190 |
+ value, subpool);
|
|
|
720190 |
}
|
|
|
720190 |
else
|
|
|
720190 |
{
|
|
|
720190 |
@@ -251,8 +267,8 @@
|
|
|
720190 |
}
|
|
|
720190 |
else if (resource->info->restype == DAV_SVN_RESTYPE_TXN_COLLECTION)
|
|
|
720190 |
{
|
|
|
720190 |
- serr = svn_repos_fs_change_txn_prop(resource->info->root.txn,
|
|
|
720190 |
- propname, value, subpool);
|
|
|
720190 |
+ serr = change_txn_prop(resource->info->root.txn, propname,
|
|
|
720190 |
+ value, subpool);
|
|
|
720190 |
}
|
|
|
720190 |
else
|
|
|
720190 |
{
|
|
|
720190 |
@@ -561,8 +577,8 @@
|
|
|
720190 |
/* Working Baseline or Working (Version) Resource */
|
|
|
720190 |
if (db->resource->baselined)
|
|
|
720190 |
if (db->resource->working)
|
|
|
720190 |
- serr = svn_repos_fs_change_txn_prop(db->resource->info->root.txn,
|
|
|
720190 |
- propname, NULL, subpool);
|
|
|
720190 |
+ serr = change_txn_prop(db->resource->info->root.txn, propname,
|
|
|
720190 |
+ NULL, subpool);
|
|
|
720190 |
else
|
|
|
720190 |
/* ### VIOLATING deltaV: you can't proppatch a baseline, it's
|
|
|
720190 |
not a working resource! But this is how we currently
|