diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-01-08 08:36:11 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-01-08 08:38:50 +0100 |
| commit | 63670d4e9030bcee490d5a9cce561373ac5b3b23 (patch) | |
| tree | 5dd7a41963c0e377678b1e61dedd3a9a54f385bd | |
| parent | upstream: more idiomatic error messages; spotted by jsg & deraadt (diff) | |
| download | openssh-63670d4e9030bcee490d5a9cce561373ac5b3b23.tar.xz openssh-63670d4e9030bcee490d5a9cce561373ac5b3b23.zip | |
upstream: fix some corner-case bugs in scp sftp-mode handling of
~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus
OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222
| -rw-r--r-- | scp.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.241 2021/10/24 21:24:17 deraadt Exp $ */ +/* $OpenBSD: scp.c,v 1.242 2022/01/08 07:36:11 djm Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -1250,13 +1250,18 @@ tolocal(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct) static char * prepare_remote_path(struct sftp_conn *conn, const char *path) { + size_t nslash; + /* Handle ~ prefixed paths */ - if (*path != '~') - return xstrdup(path); if (*path == '\0' || strcmp(path, "~") == 0) return xstrdup("."); - if (strncmp(path, "~/", 2) == 0) - return xstrdup(path + 2); + if (*path != '~') + return xstrdup(path); + if (strncmp(path, "~/", 2) == 0) { + if ((nslash = strspn(path + 2, "/")) == strlen(path + 2)) + return xstrdup("."); + return xstrdup(path + 2 + nslash); + } if (can_expand_path(conn)) return do_expand_path(conn, path); /* No protocol extension */ |