summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-08 12:28:03 +1100
committerDamien Miller <djm@mindrot.org>2013-11-08 12:28:03 +1100
commit727a3bfd3b5943bef9a9fd02812e9a75758d6d26 (patch)
treec9465c196ba7c575797626192d06e35a787a5c7d /channels.c
parent13cfd6d68237ef844dd8e02cf9ed21268154a999 (diff)
- djm@cvs.openbsd.org 2013/11/08 00:39:15
[auth-options.c auth2-chall.c authfd.c channels.c cipher-3des1.c] [clientloop.c gss-genr.c monitor_mm.c packet.c schnorr.c umac.c] [sftp-client.c sftp-glob.c] use calloc for all structure allocations; from markus@
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.c b/channels.c
index ac675c742..a1c31d8a0 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.324 2013/07/12 00:19:58 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.327 2013/11/08 00:39:15 djm 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
@@ -704,7 +704,7 @@ channel_register_status_confirm(int id, channel_confirm_cb *cb,
704 if ((c = channel_lookup(id)) == NULL) 704 if ((c = channel_lookup(id)) == NULL)
705 fatal("channel_register_expect: %d: bad id", id); 705 fatal("channel_register_expect: %d: bad id", id);
706 706
707 cc = xmalloc(sizeof(*cc)); 707 cc = xcalloc(1, sizeof(*cc));
708 cc->cb = cb; 708 cc->cb = cb;
709 cc->abandon_cb = abandon_cb; 709 cc->abandon_cb = abandon_cb;
710 cc->ctx = ctx; 710 cc->ctx = ctx;