diff options
| author |   djm <djm@openbsd.org> | 2020-07-03 07:17:35 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-07-03 07:17:35 +0000 |
| commit | 7f46b878c3b1ecfc6a8f94bd3d52cad7c67bbbea (patch) | |
| tree | 971b72059b04f181d6055d44ceeaf30132f72704 | |
| parent | zap trailing whitespace on one line (diff) | |
| download | wireguard-openbsd-7f46b878c3b1ecfc6a8f94bd3d52cad7c67bbbea.tar.xz wireguard-openbsd-7f46b878c3b1ecfc6a8f94bd3d52cad7c67bbbea.zip | |
revert r1.399 - the lifetime of c->mux_ctx is more complex; simply freeing
it here causes other problems
| -rw-r--r-- | usr.bin/ssh/channels.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index cd2e269d39a..0efb095d17f 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.399 2020/07/03 05:08:41 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.400 2020/07/03 07:17:35 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -611,8 +611,6 @@ channel_free(struct ssh *ssh, Channel *c) c->path = NULL; free(c->listening_addr); c->listening_addr = NULL; - free(c->mux_ctx); - c->mux_ctx = NULL; while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { if (cc->abandon_cb != NULL) cc->abandon_cb(ssh, c, cc->ctx); |