upstream commit
fix memory leak in error path ok djm@ Upstream-ID: dd2f402b0a0029b755df029fc7f0679e1365ce35
This commit is contained in:
parent
7d6c036203
commit
66d2e229ba
6
packet.c
6
packet.c
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: packet.c,v 1.215 2015/09/21 04:31:00 djm Exp $ */
|
/* $OpenBSD: packet.c,v 1.216 2015/10/21 11:33:03 gsoares 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,8 +2040,10 @@ 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;
|
||||||
if ((r = ssh_packet_write_poll(ssh)) != 0)
|
if ((r = ssh_packet_write_poll(ssh)) != 0) {
|
||||||
|
free(setp);
|
||||||
return r;
|
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));
|
||||||
|
|
Loading…
Reference in New Issue