svn commit: r1511353 - /subversion/trunk/subversion/svnmucc/svnmucc.c

[da...@apache.org]

Author: danielsh
Date: Wed Aug  7 15:11:04 2013
New Revision: 1511353

URL: http://svn.apache.org/r1511353
Log:
svnmucc: Fix an assertion failure.

* subversion/svnmucc/svnmucc.c
  (main): Check for URLs not having a common ancestor and emit an error
    message instead of failing an assertion later.

Patch by: Alexey Neyman <st...@att.net>
(tweaked by me)

Modified:
    subversion/trunk/subversion/svnmucc/svnmucc.c

Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1511353&r1=1511352&r2=1511353&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Wed Aug  7 15:11:04 2013
@@ -1433,7 +1433,14 @@ main(int argc, const char **argv)
           if (! anchor)
             anchor = url;
           else
-            anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+            {
+              anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+              if (!anchor || !anchor[0])
+                handle_error(svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+                                               "URLs in the action list do not "
+                                               "share a common ancestor"),
+                             pool);
+            }
 
           if ((++i == action_args->nelts) && (j + 1 < num_url_args))
             insufficient(pool);