svn commit: r1552289 - /subversion/trunk/subversion/libsvn_client/mergeinfo.c

[rhuijben]

Author: rhuijben
Date: Thu Dec 19 12:07:57 2013
New Revision: 1552289

URL: http://svn.apache.org/r1552289
Log:
* subversion/libsvn_client/mergeinfo.c
  (svn_client_suggest_merge_sources): Following up on r1552265, fix pool
    lifetime issue by allocating result in resultpool instead of temp pool.

Found by: The JavaHL tests

Modified:
    subversion/trunk/subversion/libsvn_client/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1552289&r1=1552288&r2=1552289&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Thu Dec 19 12:07:57 
2013
@@ -2272,13 +2272,15 @@ svn_client_suggest_merge_sources(apr_arr
       mergeinfo = NULL;
     }
 
+  /* ### Should we only add the last source or all copy sources back to
+         the origin? */
   SVN_ERR(svn_client__get_copy_source(&copyfrom_path, &copyfrom_rev,
                                       path_or_url, peg_revision, ra_session,
                                       ctx, session_pool, session_pool));
   if (copyfrom_path)
     {
       APR_ARRAY_PUSH(list, const char *) =
-        svn_path_url_add_component2(repos_root, copyfrom_path, session_pool);
+        svn_path_url_add_component2(repos_root, copyfrom_path, pool);
     }
 
   if (mergeinfo)