You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/06/15 11:24:08 UTC
svn commit: r1748561 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Wed Jun 15 11:24:08 2016
New Revision: 1748561
URL: http://svn.apache.org/viewvc?rev=1748561&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(svn_client_conflict_option_set_merged_propval): Copy the caller-supplied
value into the option's pool to guarantee proper lifetime.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1748561&r1=1748560&r2=1748561&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Jun 15 11:24:08 2016
@@ -4390,7 +4390,8 @@ svn_client_conflict_option_set_merged_pr
svn_client_conflict_option_t *option,
const svn_string_t *merged_propval)
{
- option->type_data.prop.merged_propval = merged_propval;
+ option->type_data.prop.merged_propval = svn_string_dup(merged_propval,
+ option->pool);
}
/* Implements conflict_option_resolve_func_t. */