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/04/17 09:46:40 UTC
svn commit: r1588151 - in /subversion/branches/1.8.x: ./
subversion/libsvn_client/merge.c
Author: svn-role
Date: Thu Apr 17 07:46:39 2014
New Revision: 1588151
URL: http://svn.apache.org/r1588151
Log:
Merge r1587946 from trunk:
* r1587946
Fix variable usage after it is out of scope.
Justification:
While not reported by users, this might cause hard to diagnose segfaults.
Votes:
+1: rhuijben, philip, steveking
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/subversion/libsvn_client/merge.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1587946
Modified: subversion/branches/1.8.x/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/merge.c?rev=1588151&r1=1588150&r2=1588151&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/merge.c Thu Apr 17 07:46:39 2014
@@ -10449,15 +10449,10 @@ merge_locked(conflict_report_t **conflic
}
else
{
- merge_source_t source;
-
- source.loc1 = source1_loc;
- source.loc2 = source2_loc;
- source.ancestral = FALSE;
-
/* Build a single-item merge_source_t array. */
merge_sources = apr_array_make(scratch_pool, 1, sizeof(merge_source_t *));
- APR_ARRAY_PUSH(merge_sources, merge_source_t *) = &source;
+ APR_ARRAY_PUSH(merge_sources, merge_source_t *)
+ = merge_source_create(source1_loc, source2_loc, FALSE, scratch_pool);
}
err = do_merge(NULL, NULL, conflict_report, &use_sleep,