upstream: put back the mux_ctx memleak fix for SSH_CHANNEL_MUX_CLIENT

OK mfriedl@

OpenBSD-Commit-ID: 1aba1da828956cacaadb81a637338734697d9798

diff --git a/channels.c b/channels.c
index fd72f371df9807448177b3fa7be88f766a39443b..1c714c845e187b9a4c645d1eb6e804e1d0177768 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.407 2021/05/19 01:24:05 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.408 2021/09/14 11:04:21 mbuhl Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -629,9 +629,11 @@ channel_free(struct ssh *ssh, Channel *c)
        debug("channel %d: free: %s, nchannels %u", c->self,
            c->remote_name ? c->remote_name : "???", n);
 
-       if (c->type == SSH_CHANNEL_MUX_CLIENT)
+       if (c->type == SSH_CHANNEL_MUX_CLIENT) {
                mux_remove_remote_forwardings(ssh, c);
-       else if (c->type == SSH_CHANNEL_MUX_LISTENER) {
+               free(c->mux_ctx);
+               c->mux_ctx = NULL;
+       } else if (c->type == SSH_CHANNEL_MUX_LISTENER) {
                free(c->mux_ctx);
                c->mux_ctx = NULL;
        }