Author: julianfoad
Date: Fri Nov 18 14:35:10 2011
New Revision: 1203670
URL: http://svn.apache.org/viewvc?rev=1203670&view=rev
Log:
* subversion/libsvn_client/merge.c
(do_directory_merge): Properly test whether an array is empty, instead of
relying on a detail of the current implementation.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1203670&r1=1203669&r2=1203670&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Nov 18 14:35:10 2011
@@ -8486,8 +8486,10 @@ do_directory_merge(svn_mergeinfo_catalog
svn_revnum_t next_end_rev;
const char *real_url1 = url1, *real_url2 = url2;
const char *old_sess1_url = NULL, *old_sess2_url = NULL;
- svn_merge_range_t *first_target_range = APR_ARRAY_IDX(
- target_merge_path->remaining_ranges, 0, svn_merge_range_t *);
+ svn_merge_range_t *first_target_range
+ = (target_merge_path->remaining_ranges->nelts == 0 ? NULL
+ : APR_ARRAY_IDX(target_merge_path->remaining_ranges, 0,
+ svn_merge_range_t *));
/* Issue #3324: Stop editor abuse! Don't call
drive_merge_report_editor() in such a way that we request an
