diff options
| author | des <des@FreeBSD.org> | 2010-11-11 11:46:19 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-11-11 11:46:19 +0000 |
| commit | 59d1af232220700389c3543e93e1b1f2e2619919 (patch) | |
| tree | 6eb7398d6e807c1a0d65a65c3e0dc92c453bb592 /crypto/openssh/sftp-client.c | |
| parent | ac0984a6533794998189315ced48d83ce881917d (diff) | |
| parent | a074372f88279f4eaaed8ab05de3f3fda1fac4eb (diff) | |
| download | FreeBSD-src-59d1af232220700389c3543e93e1b1f2e2619919.zip FreeBSD-src-59d1af232220700389c3543e93e1b1f2e2619919.tar.gz | |
Upgrade to OpenSSH 5.6p1.
Diffstat (limited to 'crypto/openssh/sftp-client.c')
| -rw-r--r-- | crypto/openssh/sftp-client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/sftp-client.c b/crypto/openssh/sftp-client.c index 6124c0f..9dab477 100644 --- a/crypto/openssh/sftp-client.c +++ b/crypto/openssh/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.90 2009/10/11 10:41:26 dtucker Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.92 2010/07/19 03:16:33 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -713,7 +713,8 @@ do_realpath(struct sftp_conn *conn, char *path) u_int status = buffer_get_int(&msg); error("Couldn't canonicalise: %s", fx2txt(status)); - return(NULL); + buffer_free(&msg); + return NULL; } else if (type != SSH2_FXP_NAME) fatal("Expected SSH2_FXP_NAME(%u) packet, got %u", SSH2_FXP_NAME, type); @@ -1522,7 +1523,7 @@ upload_dir_internal(struct sftp_conn *conn, char *src, char *dst, continue; if (upload_dir_internal(conn, new_src, new_dst, - pflag, depth + 1, printflag) == -1) + pflag, printflag, depth + 1) == -1) ret = -1; } else if (S_ISREG(sb.st_mode)) { if (do_upload(conn, new_src, new_dst, pflag) == -1) { |
