Author: philip
Date: Mon Jul 13 12:42:47 2015
New Revision: 1690654
URL: http://svn.apache.org/r1690654
Log:
On move-tracking-2 branch: fix a pool lifetime issue.
* subversion/tests/cmdline/svnmover_tests.py
(execute): Allocate iterpool from different pool.
Modified:
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1690654&r1=1690653&r2=1690654&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Mon Jul
13 12:42:47 2015
@@ -2523,7 +2523,12 @@ execute(svnmover_wc_t *wc,
{
svn_editor3_t *editor;
const char *base_relpath;
- apr_pool_t *iterpool = svn_pool_create(pool);
+ /* This pool is passed to svn_branch_merge() and needs to be a
+ subpool of the pool used to allocate the e_map members of the
+ data passed to the function. The pool relationship is required
+ by apr_hash_overlay() to guarantee the lifetime of the resulting
+ hash. */
+ apr_pool_t *iterpool = svn_pool_create(wc->pool);
int i;
editor = wc->editor;
