diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2023-03-28 09:44:32 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-03-28 10:03:54 +0200 |
| commit | 9ffa76e1284c85bf459c3dcb8e995733a8967e1b (patch) | |
| tree | 78657a1e5c42da18d74aad41785d5cc5b2134f98 /sftp.c | |
| parent | upstream: Remove compat code for OpenSSL < 1.1.* (diff) | |
| download | openssh-9ffa76e1284c85bf459c3dcb8e995733a8967e1b.tar.xz openssh-9ffa76e1284c85bf459c3dcb8e995733a8967e1b.zip | |
upstream: Plug more mem leaks in sftp by making
make_absolute_pwd_glob work in the same way as make_absolute: you
pass it a dynamically allocated string and it either returns it, or
frees it and allocates a new one. Patch from emaste at freebsd.org and
https://reviews.freebsd.org/D37253 ok djm@
OpenBSD-Commit-ID: 85f7404e9d47fd28b222fbc412678f3361d2dffc
Diffstat (limited to 'sftp.c')
| -rw-r--r-- | sftp.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.229 2023/03/12 09:41:18 dtucker Exp $ */ +/* $OpenBSD: sftp.c,v 1.230 2023/03/28 07:44:32 dtucker Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -616,15 +616,19 @@ escape_glob(const char *s) return ret; } +/* + * Arg p must be dynamically allocated. make_absolute will either return it + * or free it and and allocate a new one. Caller must free returned string. + */ static char * -make_absolute_pwd_glob(const char *p, const char *pwd) +make_absolute_pwd_glob(char *p, const char *pwd) { char *ret, *escpwd; escpwd = escape_glob(pwd); if (p == NULL) return escpwd; - ret = make_absolute(xstrdup(p), escpwd); + ret = make_absolute(p, escpwd); free(escpwd); return ret; } @@ -637,7 +641,7 @@ process_get(struct sftp_conn *conn, const char *src, const char *dst, glob_t g; int i, r, err = 0; - abs_src = make_absolute_pwd_glob(src, pwd); + abs_src = make_absolute_pwd_glob(xstrdup(src), pwd); memset(&g, 0, sizeof(g)); debug3("Looking up %s", abs_src); @@ -1997,9 +2001,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, memset(&g, 0, sizeof(g)); if (remote != LOCAL) { - tmp2 = make_absolute_pwd_glob(tmp, remote_path); - free(tmp); - tmp = tmp2; + tmp = make_absolute_pwd_glob(tmp, remote_path); remote_glob(conn, tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g); } else glob(tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g); |