diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2015-05-08 03:25:07 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-05-08 13:32:59 +1000 |
commit | 297060f42d5189a4065ea1b6f0afdf6371fb0507 (patch) | |
tree | 02f927148e3345691e862f9d5c937da600850ba1 | |
parent | 63ebf019be863b2d90492a85e248cf55a6e87403 (diff) |
upstream commit
Use xcalloc for permitted_adm_opens instead of xmalloc to
ensure it's zeroed. Fixes post-auth crash with permitopen=none. bz#2355, ok
djm@
-rw-r--r-- | channels.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.c b/channels.c index f72b8cc62..b0b1c58dd 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.342 2015/04/24 01:36:00 deraadt Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.343 2015/05/08 03:25:07 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -3533,7 +3533,7 @@ void | |||
3533 | channel_disable_adm_local_opens(void) | 3533 | channel_disable_adm_local_opens(void) |
3534 | { | 3534 | { |
3535 | channel_clear_adm_permitted_opens(); | 3535 | channel_clear_adm_permitted_opens(); |
3536 | permitted_adm_opens = xmalloc(sizeof(*permitted_adm_opens)); | 3536 | permitted_adm_opens = xcalloc(sizeof(*permitted_adm_opens), 1); |
3537 | permitted_adm_opens[num_adm_permitted_opens].host_to_connect = NULL; | 3537 | permitted_adm_opens[num_adm_permitted_opens].host_to_connect = NULL; |
3538 | num_adm_permitted_opens = 1; | 3538 | num_adm_permitted_opens = 1; |
3539 | } | 3539 | } |