RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2018-12-07 02:31:20 +00:00 committed by Damien Miller
parent 87d6cf1cbc
commit 285310b897
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels.c
View File

@ -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));