Follow up to r1667699 and r1667700: Revert to using a stack-based array instead of a heap-allocated array, but do make sure that the calculated array size is both sufficiently large and a compile-time constant.
Follow up to r1667699 and r1667700: Revert to using a stack-based array
instead of a heap-allocated array, but do make sure that the calculated
array size is both sufficiently large and a compile-time constant.

* subversion/svn/conflict-callbacks.c
  (MAX_ARRAY_LEN): New macro; expands to a compile-time constant
   whose value is the larger of two array sizes.
  (handle_text_conflict): Allocate the 'options' array on the stack.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1674487 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion