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 2015/03/19 12:05:40 UTC
svn commit: r1667700 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu Mar 19 11:05:39 2015
New Revision: 1667700
URL: http://svn.apache.org/r1667700
Log:
Follow-up to r1667699:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Properly calculate options array size.
Found by: rhuijben
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1667700&r1=1667699&r2=1667700&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Mar 19 11:05:39 2015
@@ -750,9 +750,10 @@ handle_text_conflict(svn_wc_conflict_res
svn_pool_clear(iterpool);
options = apr_palloc(iterpool,
- desc->is_binary
- ? ARRAY_LEN(binary_conflict_options)
- : ARRAY_LEN(text_conflict_options));
+ sizeof (const char *) *
+ (desc->is_binary
+ ? ARRAY_LEN(binary_conflict_options)
+ : ARRAY_LEN(text_conflict_options)));
next_option = options;
*next_option++ = "p";