You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/01/06 05:04:10 UTC
svn commit: r1555656 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_client/util.c
Author: svn-role
Date: Mon Jan 6 04:04:10 2014
New Revision: 1555656
URL: http://svn.apache.org/r1555656
Log:
Merge r1550803 from trunk:
* r1550803
Fix pool lifetime of variables in svn_client_commit_item3_t when duplicated.
Justification:
Pool lifetime issues are bad, and debugging them hard.
Votes:
+1: rhuijben, danielsh, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_client/util.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1550803
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1555656&r1=1555655&r2=1555656&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jan 6 04:04:10 2014
@@ -277,10 +277,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1550803
- Fix pool lifetime of variables in svn_client_commit_item3_t when duplicated.
- Justification:
- Pool lifetime issues are bad, and debugging them hard.
- Votes:
- +1: rhuijben, danielsh, stefan2
-
Modified: subversion/branches/1.8.x/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/util.c?rev=1555656&r1=1555655&r2=1555656&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/util.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/util.c Mon Jan 6 04:04:10 2014
@@ -166,6 +166,13 @@ svn_client_commit_item3_dup(const svn_cl
new_item->outgoing_prop_changes =
svn_prop_array_dup(new_item->outgoing_prop_changes, pool);
+ if (new_item->session_relpath)
+ new_item->session_relpath = apr_pstrdup(pool, new_item->session_relpath);
+
+ if (new_item->moved_from_abspath)
+ new_item->moved_from_abspath = apr_pstrdup(pool,
+ new_item->moved_from_abspath);
+
return new_item;
}