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 EC01C10A38 for ; Tue, 19 Nov 2013 12:59:09 +0000 (UTC) Received: (qmail 41092 invoked by uid 500); 19 Nov 2013 12:59:09 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 41079 invoked by uid 500); 19 Nov 2013 12:59:08 -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 41072 invoked by uid 99); 19 Nov 2013 12:59:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 12:59:07 +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; Tue, 19 Nov 2013 12:59:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 92D712388A5E; Tue, 19 Nov 2013 12:58:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1543413 - /subversion/trunk/subversion/svn/svn.c Date: Tue, 19 Nov 2013 12:58:44 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131119125844.92D712388A5E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Tue Nov 19 12:58:44 2013 New Revision: 1543413 URL: http://svn.apache.org/r1543413 Log: * subversion/svn/svn.c (sub_main): Combine possible errors instead of leaking one if an error occurs during flushing. Found by: julianfoad Modified: subversion/trunk/subversion/svn/svn.c Modified: subversion/trunk/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1543413&r1=1543412&r2=1543413&view=diff ============================================================================== --- subversion/trunk/subversion/svn/svn.c (original) +++ subversion/trunk/subversion/svn/svn.c Tue Nov 19 12:58:44 2013 @@ -3012,7 +3012,7 @@ sub_main(int argc, const char *argv[], a /* Ensure that stdout is flushed, so the user will see any write errors. This makes sure that output is not silently lost. */ - SVN_INT_ERR(svn_cmdline_fflush(stdout)); + err = svn_error_compose_create(err, svn_cmdline_fflush(stdout)); return EXIT_ERROR(err); }