upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;

simply freeing it here causes other problems

OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed

diff --git a/channels.c b/channels.c
index 14f958fa62d013b220773ffaea25a09bf8692f4f..f23066dff61f9abb82d87243d10ac12318c17071 100644 (file)
--- 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);