diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-07-03 07:17:35 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-07-03 17:22:28 +1000 |
commit | d8195914eb43b20b13381f4e5a74f9f8a14f0ded (patch) | |
tree | 8d744702a1ec6c53e3f6d894b1143ee9c1f543a2 | |
parent | 20b5fab9f773b3d3c7f06cb15b8f69a2c081ee80 (diff) |
upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;
simply freeing it here causes other problems
OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed
-rw-r--r-- | channels.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels.c b/channels.c index 14f958fa6..f23066dff 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.399 2020/07/03 05:08:41 djm Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.400 2020/07/03 07:17:35 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,8 +621,6 @@ 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; | ||
626 | while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { | 624 | while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { |
627 | if (cc->abandon_cb != NULL) | 625 | if (cc->abandon_cb != NULL) |
628 | cc->abandon_cb(ssh, c, cc->ctx); | 626 | cc->abandon_cb(ssh, c, cc->ctx); |