Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 184AA7BD3 for ; Fri, 2 Sep 2011 17:22:28 +0000 (UTC) Received: (qmail 72571 invoked by uid 500); 2 Sep 2011 17:22:27 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 72546 invoked by uid 500); 2 Sep 2011 17:22:27 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 72539 invoked by uid 99); 2 Sep 2011 17:22:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 17:22:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 17:22:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 06E472388A33 for ; Fri, 2 Sep 2011 17:22:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164645 - /subversion/trunk/subversion/libsvn_client/cmdline.c Date: Fri, 02 Sep 2011 17:22:03 -0000 To: commits@subversion.apache.org From: pburba@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110902172204.06E472388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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,