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

upstream commit 

fix possible hang on closed output; bz#2469 reported by Tomas
 Kuthan ok markus@

Upstream-ID: f7afd41810f8540f524284f1be6b970859f94fe3
This commit is contained in:
djm@openbsd.org 2015-09-21 04:31:00 +00:00 committed by Damien Miller
parent 0097248f90
commit 8408218c1c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.214 2015/08/20 22:32:42 deraadt Exp $ */ /* $OpenBSD: packet.c,v 1.215 2015/09/21 04:31:00 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2040,7 +2040,8 @@ ssh_packet_write_wait(struct ssh *ssh)
NFDBITS), sizeof(fd_mask)); NFDBITS), sizeof(fd_mask));
if (setp == NULL) if (setp == NULL)
return SSH_ERR_ALLOC_FAIL; return SSH_ERR_ALLOC_FAIL;
ssh_packet_write_poll(ssh); if ((r = ssh_packet_write_poll(ssh)) != 0)
return r;
while (ssh_packet_have_data_to_write(ssh)) { while (ssh_packet_have_data_to_write(ssh)) {
memset(setp, 0, howmany(state->connection_out + 1, memset(setp, 0, howmany(state->connection_out + 1,
NFDBITS) * sizeof(fd_mask)); NFDBITS) * sizeof(fd_mask));