diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-05-03 06:11:00 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-05-08 10:42:43 +0200 |
| commit | 62be1ffe5ffc68cfaac183320503c00a8c72e0b1 (patch) | |
| tree | 387132a9d2de8db8c81fccb7ae74f29ab91ce08b | |
| parent | upstream: Free host on exit path. Patch from markus at (diff) | |
| download | openssh-62be1ffe5ffc68cfaac183320503c00a8c72e0b1.tar.xz openssh-62be1ffe5ffc68cfaac183320503c00a8c72e0b1.zip | |
upstream: Free channel objects on exit path. Patch from markus at
blueflash.cc, ok deraadt
OpenBSD-Commit-ID: dbe4db381603909482211ffdd2b48abd72169117
| -rw-r--r-- | channels.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/channels.c b/channels.c index 657381b80..07cb4f9a7 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.389 2019/01/19 21:37:13 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.390 2019/05/03 04:11:00 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -639,10 +639,30 @@ void channel_free_all(struct ssh *ssh) { u_int i; + struct ssh_channels *sc = ssh->chanctxt; - for (i = 0; i < ssh->chanctxt->channels_alloc; i++) - if (ssh->chanctxt->channels[i] != NULL) - channel_free(ssh, ssh->chanctxt->channels[i]); + for (i = 0; i < sc->channels_alloc; i++) + if (sc->channels[i] != NULL) + channel_free(ssh, sc->channels[i]); + + free(sc->channels); + sc->channels = NULL; + sc->channels_alloc = 0; + sc->channel_max_fd = 0; + + free(sc->x11_saved_display); + sc->x11_saved_display = NULL; + + free(sc->x11_saved_proto); + sc->x11_saved_proto = NULL; + + free(sc->x11_saved_data); + sc->x11_saved_data = NULL; + sc->x11_saved_data_len = 0; + + free(sc->x11_fake_data); + sc->x11_fake_data = NULL; + sc->x11_fake_data_len = 0; } /* |