Attachment 717967 Details for Bug 929082 – patch-against-1.7.8

[patch] patch-against-1.7.8

CVE-2013-1845-patch-against-1.7.8.patch (text/plain), 4.62 KB, created by Huzaifa S. Sidhpurwala on 2013-03-29 08:33:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Huzaifa S. Sidhpurwala

Created: 2013-03-29 08:33:58 UTC

Size: 4.62 KB

patch

obsolete

>Index: subversion/mod_dav_svn/deadprops.c
>===================================================================
>--- subversion/mod_dav_svn/deadprops.c	(revision 1458455)
>+++ subversion/mod_dav_svn/deadprops.c	(working copy)
>@@ -168,6 +168,7 @@ save_value(dav_db *db, const dav_prop_name *name,
>   const char *propname;
>   svn_error_t *serr;
>   const dav_resource *resource = db->resource;
>+  apr_pool_t *subpool;
> 
>   /* get the repos-local name */
>   get_repos_propname(db, name, &propname);
>@@ -202,6 +203,9 @@ save_value(dav_db *db, const dav_prop_name *name,
> 
>   */
> 
>+  /* A subpool to cope with mod_dav making multiple calls, e.g. during
>+     PROPPATCH with multiple values. */
>+  subpool = svn_pool_create(db->resource->pool);
>   if (db->resource->baselined)
>     {
>       if (db->resource->working)
>@@ -208,7 +212,7 @@ save_value(dav_db *db, const dav_prop_name *name,
>         {
>           serr = svn_repos_fs_change_txn_prop(resource->info->root.txn,
>                                               propname, value,
>-                                              resource->pool);
>+                                              subpool);
>         }
>       else
>         {
>@@ -219,7 +223,7 @@ save_value(dav_db *db, const dav_prop_name *name,
>                                                TRUE, TRUE,
>                                                db->authz_read_func,
>                                                db->authz_read_baton,
>-                                               resource->pool);
>+                                               subpool);
> 
>           /* Prepare any hook failure message to get sent over the wire */
>           if (serr)
>@@ -242,20 +246,21 @@ save_value(dav_db *db, const dav_prop_name *name,
>           dav_svn__operational_log(resource->info,
>                                    svn_log__change_rev_prop(
>                                       resource->info->root.rev,
>-                                      propname, resource->pool));
>+                                      propname, subpool));
>         }
>     }
>   else if (resource->info->restype == DAV_SVN_RESTYPE_TXN_COLLECTION)
>     {
>       serr = svn_repos_fs_change_txn_prop(resource->info->root.txn,
>-                                          propname, value, resource->pool);
>+                                          propname, value, subpool);
>     }
>   else
>     {
>       serr = svn_repos_fs_change_node_prop(resource->info->root.root,
>                                            get_repos_path(resource->info),
>-                                           propname, value, resource->pool);
>+                                           propname, value, subpool);
>     }
>+  svn_pool_destroy(subpool);
> 
>   if (serr != NULL)
>     return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
>@@ -540,6 +545,7 @@ db_remove(dav_db *db, const dav_prop_name *name)
> {
>   svn_error_t *serr;
>   const char *propname;
>+  apr_pool_t *subpool;
> 
>   /* get the repos-local name */
>   get_repos_propname(db, name, &propname);
>@@ -548,11 +554,15 @@ db_remove(dav_db *db, const dav_prop_name *name)
>   if (propname == NULL)
>     return NULL;
> 
>+  /* A subpool to cope with mod_dav making multiple calls, e.g. during
>+     PROPPATCH with multiple values. */
>+  subpool = svn_pool_create(db->resource->pool);
>+
>   /* Working Baseline or Working (Version) Resource */
>   if (db->resource->baselined)
>     if (db->resource->working)
>       serr = svn_repos_fs_change_txn_prop(db->resource->info->root.txn,
>-                                          propname, NULL,
>                                           db->resource->pool);
>+                                          propname, NULL, subpool);
>     else
>       /* ### VIOLATING deltaV: you can't proppatch a baseline, it's
>          not a working resource!  But this is how we currently
>@@ -564,11 +574,12 @@ db_remove(dav_db *db, const dav_prop_name *name)
>                                            propname, NULL, NULL, TRUE, TRUE,
>                                            db->authz_read_func,
>                                            db->authz_read_baton,
>-                                           db->resource->pool);
>+                                           subpool);
>   else
>     serr = svn_repos_fs_change_node_prop(db->resource->info->root.root,
>                                          get_repos_path(db->resource->info),
>-                                         propname, NULL, db->resource->pool);
>+                                         propname, NULL, subpool);
>+  svn_pool_destroy(subpool);
>   if (serr != NULL)
>     return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
>                                 "could not remove a property",
>]]]

Actions: View | Diff

Attachments on bug 929082: 717966 | 717967