diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-07-03 09:17:35 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-07-03 09:22:28 +0200 |
| commit | d8195914eb43b20b13381f4e5a74f9f8a14f0ded (patch) | |
| tree | 8d744702a1ec6c53e3f6d894b1143ee9c1f543a2 | |
| parent | upstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - if (diff) | |
| download | openssh-d8195914eb43b20b13381f4e5a74f9f8a14f0ded.tar.xz openssh-d8195914eb43b20b13381f4e5a74f9f8a14f0ded.zip | |
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 @@ -/* $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 @@ -621,8 +621,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); |