diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-12-07 03:31:20 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-12-07 03:58:49 +0100 |
| commit | 285310b897969a63ef224d39e7cc2b7316d86940 (patch) | |
| tree | 53861bee5c553c739eda4a85380f940bd5b515b1 /channels.c | |
| parent | upstream: don't attempt to connect to empty SSH_AUTH_SOCK; bz#293 (diff) | |
| download | openssh-285310b897969a63ef224d39e7cc2b7316d86940.tar.xz openssh-285310b897969a63ef224d39e7cc2b7316d86940.zip | |
upstream: no need to allocate channels_pre/channels_post in
channel_init_channels() as we do it anyway in channel_handler_init() that we
call at the end of the function. Fix from Markus Schmidt via bz#2938
OpenBSD-Commit-ID: 74893638af49e3734f1e33a54af1b7ea533373ed
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/channels.c b/channels.c index c85d46abd..6d2e1c6a6 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.386 2018/10/04 01:04:52 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.387 2018/12/07 02:31:20 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -227,11 +227,7 @@ channel_init_channels(struct ssh *ssh) { struct ssh_channels *sc; - if ((sc = calloc(1, sizeof(*sc))) == NULL || - (sc->channel_pre = calloc(SSH_CHANNEL_MAX_TYPE, - sizeof(*sc->channel_pre))) == NULL || - (sc->channel_post = calloc(SSH_CHANNEL_MAX_TYPE, - sizeof(*sc->channel_post))) == NULL) + if ((sc = calloc(1, sizeof(*sc))) == NULL) fatal("%s: allocation failed", __func__); sc->channels_alloc = 10; sc->channels = xcalloc(sc->channels_alloc, sizeof(*sc->channels)); |