subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1164645 - /subversion/trunk/subversion/libsvn_client/cmdline.c
Date Fri, 02 Sep 2011 17:22:03 GMT
Author: pburba
Date: Fri Sep  2 17:22:03 2011
New Revision: 1164645

URL: http://svn.apache.org/viewvc?rev=1164645&view=rev
Log:
Fix issue #3999 'svn merge with bad option or target segfaults'.

* subversion/libsvn_client/cmdline.c

  (check_root_url_of_target): Instead of segfaulting, do as the doc string
   promises: "If a root url is not found for TARGET because it does not
   exist in the repository, then return with no error".

Modified:
    subversion/trunk/subversion/libsvn_client/cmdline.c

Modified: subversion/trunk/subversion/libsvn_client/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cmdline.c?rev=1164645&r1=1164644&r2=1164645&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_client/cmdline.c Fri Sep  2 17:22:03 2011
@@ -142,7 +142,7 @@ check_root_url_of_target(const char **ro
         return svn_error_trace(err);
      }
 
-   if (*root_url != NULL)
+   if (*root_url && tmp_root_url)
      {
        if (strcmp(*root_url, tmp_root_url) != 0)
          return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,



Mime
View raw message