You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2018/11/01 08:39:25 UTC
svn commit: r1845408 -
/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Author: brane
Date: Thu Nov 1 08:39:25 2018
New Revision: 1845408
URL: http://svn.apache.org/viewvc?rev=1845408&view=rev
Log:
Prevent some coredumps when using JavaHL SVNClient::diff().
* subversion/bindings/javahl/native/SVNClient.cpp
(SVNClient::diff): Replace NULL stderr stream in calls to
svn_client_diff_peg6() and svn_client_diff6() with
calls to svn_stream_empty().
Patch by: Matthew Burt
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1845408&r1=1845407&r2=1845408&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Nov 1 08:39:25 2018
@@ -1055,7 +1055,8 @@ void SVNClient::diff(const char *target1
options.useGitDiffFormat(),
SVN_APR_LOCALE_CHARSET,
outputStream.getStream(subPool),
- NULL /* error file */,
+ // Discard stderr; TODO: Update JavaHL API
+ svn_stream_empty(subPool.getPool()),
changelists.array(subPool),
ctx,
subPool.getPool()),
@@ -1084,7 +1085,8 @@ void SVNClient::diff(const char *target1
options.useGitDiffFormat(),
SVN_APR_LOCALE_CHARSET,
outputStream.getStream(subPool),
- NULL /* error stream */,
+ // Discard stderr; TODO: Update JavaHL API
+ svn_stream_empty(subPool.getPool()),
changelists.array(subPool),
ctx,
subPool.getPool()),