[SVN-3999] svn merge with bad option or target segfaults

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.7.x
• Fix Version/s: 1.7.0
• Component/s: libsvn_client
• Assignee: Paul Burba
• Reporter: Paul Burba
• Created: 01/Sep/11 19:35
• Updated: 27/Oct/18 16:28
• Resolved: 06/Sep/11 13:25

Description

With a 1.6.x client if we pass an invalid target or option we get errors (not
always the most helpful errors, but something):

C:\SVN\sandbox\src-trunk-1.6.x-wc>svn merge ^^/subversion/trunk
bad-target-or-option -c-1164027
..\..\..\subversion\libsvn_client\merge.c:8917: (apr_err=150000)
svn: 'bad-target-or-option' is not under version control

C:\SVN\sandbox\src-trunk-1.6.x-wc>svn merge ^^/subversion/trunk .
bad-target-or-option -c-1164027
..\..\..\subversion\svn\main.c:2129: (apr_err=205000)
svn: Try 'svn help' for more info
..\..\..\subversion\svn\merge-cmd.c:159: (apr_err=205000)
svn: Too many arguments given

C:\SVN\sandbox\src-trunk-1.6.x-wc>svn merge ^^/subversion/trunk .
bad-target-or-option
..\..\..\subversion\svn\merge-cmd.c:207: (apr_err=195002)
svn: A working copy merge source needs an explicit revision

### On trunk@1164165 we handle the case with a single bad target (albeit with a
different error message):

C:\SVN\src-trunk>svn merge ^^/subversion/trunk bad-target-or-option -c-1164027
..\..\..\subversion\svn\util.c:913: (apr_err=155010)
..\..\..\subversion\libsvn_client\merge.c:11349: (apr_err=155010)
..\..\..\subversion\libsvn_client\merge.c:11303: (apr_err=155010)
..\..\..\subversion\libsvn_client\merge.c:11303: (apr_err=155010)
..\..\..\subversion\libsvn_client\merge.c:11204: (apr_err=155010)
svn: E155010: Path 'C:\SVN\src-trunk\bad-target-or-option' does not exist

### But there is a segfault when there is a valid target and a second bad
target/option

C:\SVN\src-trunk>svn merge ^^/subversion/trunk . bad-target-or-option -c-1164027
This application has halted due to an unexpected error.
A crash report and minidump file were saved to disk, you can find them here:
C:\Users\pburba\AppData\Local\Temp\svn-crash-log20110901150313.log
C:\Users\pburba\AppData\Local\Temp\svn-crash-log20110901150313.dmp
Please send the log file to [e-mail] to help us analyze
and solve this problem.

NOTE: The crash report and minidump files can contain some sensitive information
(filenames, partial file content, usernames and passwords etc.)

C:\SVN\src-trunk>svn merge ^^/subversion/trunk . bad-target-or-option
This application has halted due to an unexpected error.
A crash report and minidump file were saved to disk, you can find them here:
C:\Users\pburba\AppData\Local\Temp\svn-crash-log20110901150322.log
C:\Users\pburba\AppData\Local\Temp\svn-crash-log20110901150322.dmp
Please send the log file to [e-mail] to help us analyze
and solve this problem.

NOTE: The crash report and minidump files can contain some sensitive information
(filenames, partial file content, usernames and passwords etc.)