undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connect.c: handle errors from split_cmdline

Browse Source 
Commit e9d9a8a4d (connect: handle putty/plink also in
GIT_SSH_COMMAND, 2017-01-02) added a call to
split_cmdline(), but checks only for a non-zero return to
see if we got any output. Since the function returns
negative values (and a NULL argv) on error, we end up
dereferencing NULL and segfaulting.

Arguably we could report on the parsing error here, but it's
probably not worth it. This is a best-effort attempt to see
if we are using plink. So we can simply return here with
"no, it wasn't plink" and let the shell actually complain
about the bogus quoting.

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2017-04-10 20:30:23 -04:00 committed by Junio C Hamano
parent 486c8e8c6a
commit 22e5ae5c8e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect.c
View File

@ -730,7 +730,7 @@ static void handle_ssh_variant(const char *ssh_command, int is_cmdline,
const char **ssh_argv; const char **ssh_argv;
p = xstrdup(ssh_command); p = xstrdup(ssh_command);
if (split_cmdline(p, &ssh_argv)) { if (split_cmdline(p, &ssh_argv) > 0) {
variant = basename((char *)ssh_argv[0]); variant = basename((char *)ssh_argv[0]);
/* /*
* At this point, variant points into the buffer * At this point, variant points into the buffer

6
t/t5601-clone.sh
View File

@ -427,6 +427,12 @@ test_expect_success 'GIT_SSH_VARIANT overrides plink to tortoiseplink' '
expect_ssh "-batch -P 123" myhost src expect_ssh "-batch -P 123" myhost src
' '
test_expect_success 'clean failure on broken quoting' '
test_must_fail \
env GIT_SSH_COMMAND="${SQ}plink.exe -v" \
git clone "[myhost:123]:src" sq-failure
'
# Reset the GIT_SSH environment variable for clone tests. # Reset the GIT_SSH environment variable for clone tests.
setup_ssh_wrapper setup_ssh_wrapper