Skip to content

Commit

Permalink
upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;
Browse files Browse the repository at this point in the history
simply freeing it here causes other problems

OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed
  • Loading branch information
djmdjm committed Jul 3, 2020
1 parent 20b5fab commit d819591
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions channels.c
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
* Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit d819591

Please sign in to comment.