tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

simply freeing it here causes other problems

OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed
This commit is contained in:
djm@openbsd.org 2020-07-03 07:17:35 +00:00 committed by Damien Miller
parent 20b5fab9f7
commit d8195914eb
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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; c->path = NULL;
free(c->listening_addr); free(c->listening_addr);
c->listening_addr = NULL; c->listening_addr = NULL;
free(c->mux_ctx);
c->mux_ctx = NULL;
while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) {
if (cc->abandon_cb != NULL) if (cc->abandon_cb != NULL)
cc->abandon_cb(ssh, c, cc->ctx); cc->abandon_cb(ssh, c, cc->ctx);