diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-07-03 05:08:41 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-07-03 15:12:31 +1000 |
commit | 1b90ddde49e2ff377204082b6eb130a096411dc1 (patch) | |
tree | 93781d1d6ee28d70c61753b071fd8647b53cb1a8 /channels.c | |
parent | 55ef3e9cbd5b336bd0f89205716924886fcf86de (diff) |
upstream: fix memory leak of mux_ctx; patch from Sergiy Lozovsky
via bz3189 ok dtucker
OpenBSD-Commit-ID: db249bd4526fd42d0f4f43f72f7b8b7705253bde
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels.c b/channels.c index 95a51e21b..14f958fa6 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.398 2020/04/25 06:59:36 dtucker Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.399 2020/07/03 05:08:41 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -621,6 +621,8 @@ channel_free(struct ssh *ssh, Channel *c) | |||
621 | c->path = NULL; | 621 | c->path = NULL; |
622 | free(c->listening_addr); | 622 | free(c->listening_addr); |
623 | c->listening_addr = NULL; | 623 | c->listening_addr = NULL; |
624 | free(c->mux_ctx); | ||
625 | c->mux_ctx = NULL; | ||
624 | while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { | 626 | while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { |
625 | if (cc->abandon_cb != NULL) | 627 | if (cc->abandon_cb != NULL) |
626 | cc->abandon_cb(ssh, c, cc->ctx); | 628 | cc->abandon_cb(ssh, c, cc->ctx); |