You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2013/11/19 13:58:44 UTC

svn commit: r1543413 - /subversion/trunk/subversion/svn/svn.c

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);
     }