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 2016/06/15 08:12:28 UTC
svn commit: r1748516 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Wed Jun 15 08:12:28 2016
New Revision: 1748516
URL: http://svn.apache.org/viewvc?rev=1748516&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(prompt_string): Skip unrecognized options when building the conflict prompt.
Fixes a crash in 'svn resolve' on trunk.
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=1748516&r1=1748515&r2=1748516&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Jun 15 08:12:28 2016
@@ -574,6 +574,8 @@ prompt_string(const resolver_option_t *o
if (! *option_codes)
break;
opt = find_option(options, *option_codes++);
+ if (opt == NULL)
+ continue;
}
else
{