[openssh-commits] [openssh] 01/01: upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit d8195914eb43b20b13381f4e5a74f9f8a14f0ded
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Jul 3 07:17:35 2020 +0000

    upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;
    
    simply freeing it here causes other problems
    
    OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed
---
 channels.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/channels.c b/channels.c
index 14f958fa..f23066df 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.