You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/11/04 04:01:09 UTC
svn commit: r1845710 - in /subversion/branches/1.11.x: ./ STATUS
subversion/bindings/javahl/native/SVNClient.cpp
Author: svn-role
Date: Sun Nov 4 04:01:09 2018
New Revision: 1845710
URL: http://svn.apache.org/viewvc?rev=1845710&view=rev
Log:
Merge r1845408 from trunk:
* r1845408
Prevent some coredumps when using JavaHL SVNClient::diff().
Justification:
Fixes crash in client code when an external diff tool is used..
Votes:
+1: brane
+0: rhuijben
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/bindings/javahl/native/SVNClient.cpp
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 4 04:01:09 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204,1845261,1845555
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204,1845261,1845408,1845555
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845710&r1=1845709&r2=1845710&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Nov 4 04:01:09 2018
@@ -43,14 +43,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1845408
- Prevent some coredumps when using JavaHL SVNClient::diff().
- Justification:
- Fixes crash in client code when an external diff tool is used..
- Votes:
- +1: brane
- +0: rhuijben
-
* r1845556, r1845559
Fix (false positive) gcc 8.x -Wmisleading-indentation warnings.
Justification:
Modified: subversion/branches/1.11.x/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/bindings/javahl/native/SVNClient.cpp?rev=1845710&r1=1845709&r2=1845710&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/1.11.x/subversion/bindings/javahl/native/SVNClient.cpp Sun Nov 4 04:01:09 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()),