Author: ivan
Date: Wed Oct 12 11:15:53 2016
New Revision: 1764439
URL: http://svn.apache.org/viewvc?rev=1764439&view=rev
Log:
Follow-up to r1764423: tweak initial size of APR array for the text conflict
options to match maximum number of entries to be added.
* subversion/libsvn_client/conflicts.c
(svn_client_conflict_text_get_resolution_options): Pass 7 instead of 6 as
initial APR array size.
Found by: luke1410
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=1764439&r1=1764438&r2=1764439&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Oct 12 11:15:53
2016
@@ -7135,7 +7135,7 @@ svn_client_conflict_text_get_resolution_
SVN_ERR(assert_text_conflict(conflict, scratch_pool));
- *options = apr_array_make(result_pool, 6,
+ *options = apr_array_make(result_pool, 7,
sizeof(svn_client_conflict_option_t *));
add_resolution_option(*options, conflict,
