Author: cmpilato
Date: Wed May 15 17:28:46 2013
New Revision: 1482970
URL: http://svn.apache.org/r1482970
Log:
Fix issue #4366 ("client SEGFAULTs diffing a repos rev in which an
empty file was added").
* subversion/libsvn_client/repos_diff.c
(apply_textdelta): Pass TRUE for the open_on_close parameter of
calls to svn_stream_lazyopen_create().
* subversion/tests/cmdline/diff_tests.py
(diff_repos_empty_file_addition): Remove @XFail() decorator.
Modified:
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1482970&r1=1482969&r2=1482970&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Wed May 15 17:28:46
2013
@@ -933,12 +933,12 @@ apply_textdelta(void *file_baton,
}
/* Open the file to be used as the base for second revision */
- src_stream = svn_stream_lazyopen_create(lazy_open_source, fb, FALSE,
+ src_stream = svn_stream_lazyopen_create(lazy_open_source, fb, TRUE,
scratch_pool);
/* Open the file that will become the second revision after applying the
text delta, it starts empty */
- result_stream = svn_stream_lazyopen_create(lazy_open_result, fb, FALSE,
+ result_stream = svn_stream_lazyopen_create(lazy_open_result, fb, TRUE,
scratch_pool);
svn_txdelta_apply(src_stream,
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1482970&r1=1482969&r2=1482970&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Wed May 15 17:28:46
2013
@@ -4507,7 +4507,6 @@ def diff_dir_replaced_by_dir(sbox):
'diff', '--summarize', wc_dir)
-@XFail()
@Issue(4366)
def diff_repos_empty_file_addition(sbox):
"repos diff of rev which adds empty file"
