tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2011/09/11 16:07:26 

[sftp-client.c]
     fix leaks in do_hardlink() and do_readlink(); bz#1921
     from Loganaden Velvindron
This commit is contained in:
Damien Miller 2011-09-22 21:41:05 +10:00
parent 1bcbd0a9de
commit 3decdba425
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -63,6 +63,10 @@
- okan@cvs.openbsd.org 2011/09/11 06:59:05 - okan@cvs.openbsd.org 2011/09/11 06:59:05
[ssh.1] [ssh.1]
document new -O cancel command; ok djm@ document new -O cancel command; ok djm@
- markus@cvs.openbsd.org 2011/09/11 16:07:26
[sftp-client.c]
fix leaks in do_hardlink() and do_readlink(); bz#1921
from Loganaden Velvindron
20110909 20110909
- (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From

11
sftp-client.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-client.c,v 1.94 2010/12/04 00:18:01 djm Exp $ */ /* $OpenBSD: sftp-client.c,v 1.95 2011/09/11 16:07:26 markus Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -805,15 +805,15 @@ do_hardlink(struct sftp_conn *conn, char *oldpath, char *newpath)
Buffer msg; Buffer msg;
u_int status, id; u_int status, id;
buffer_init(&msg);
/* Send link request */
id = conn->msg_id++;
if ((conn->exts & SFTP_EXT_HARDLINK) == 0) { if ((conn->exts & SFTP_EXT_HARDLINK) == 0) {
error("Server does not support hardlink@openssh.com extension"); error("Server does not support hardlink@openssh.com extension");
return -1; return -1;
} }
buffer_init(&msg);
/* Send link request */
id = conn->msg_id++;
buffer_put_char(&msg, SSH2_FXP_EXTENDED); buffer_put_char(&msg, SSH2_FXP_EXTENDED);
buffer_put_int(&msg, id); buffer_put_int(&msg, id);
buffer_put_cstring(&msg, "hardlink@openssh.com"); buffer_put_cstring(&msg, "hardlink@openssh.com");
@ -889,6 +889,7 @@ do_readlink(struct sftp_conn *conn, char *path)
u_int status = buffer_get_int(&msg); u_int status = buffer_get_int(&msg);
error("Couldn't readlink: %s", fx2txt(status)); error("Couldn't readlink: %s", fx2txt(status));
buffer_free(&msg);
return(NULL); return(NULL);
} else if (type != SSH2_FXP_NAME) } else if (type != SSH2_FXP_NAME)
fatal("Expected SSH2_FXP_NAME(%u) packet, got %u", fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",