diff options
author | delphij <delphij@FreeBSD.org> | 2013-11-11 09:19:58 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2013-11-11 09:19:58 +0000 |
commit | 454aa852775e6b588c94920bed615117c03b68e3 (patch) | |
tree | c4bbdc1d8ff81449a2f752ae23209759c2e18ab5 /crypto/openssh/clientloop.c | |
parent | 5c6a9c13c5db23bbfd599dcc3dfd4da68e2a9266 (diff) | |
download | FreeBSD-src-454aa852775e6b588c94920bed615117c03b68e3.zip FreeBSD-src-454aa852775e6b588c94920bed615117c03b68e3.tar.gz |
MFV r257952:
Upgrade to OpenSSH 6.4p1.
Bump VersionAddendum.
Approved by: des
Diffstat (limited to 'crypto/openssh/clientloop.c')
-rw-r--r-- | crypto/openssh/clientloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/clientloop.c b/crypto/openssh/clientloop.c index ad390b1..186b78d 100644 --- a/crypto/openssh/clientloop.c +++ b/crypto/openssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.253 2013/06/07 15:37:52 dtucker Exp $ */ +/* $OpenBSD: clientloop.c,v 1.255 2013/11/08 00:39:15 djm Exp $ */ /* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -838,7 +838,7 @@ void client_expect_confirm(int id, const char *request, enum confirm_action action) { - struct channel_reply_ctx *cr = xmalloc(sizeof(*cr)); + struct channel_reply_ctx *cr = xcalloc(1, sizeof(*cr)); cr->request_type = request; cr->action = action; @@ -861,7 +861,7 @@ client_register_global_confirm(global_confirm_cb *cb, void *ctx) return; } - gc = xmalloc(sizeof(*gc)); + gc = xcalloc(1, sizeof(*gc)); gc->cb = cb; gc->ctx = ctx; gc->ref_count = 1; @@ -1439,7 +1439,7 @@ client_new_escape_filter_ctx(int escape_char) { struct escape_filter_ctx *ret; - ret = xmalloc(sizeof(*ret)); + ret = xcalloc(1, sizeof(*ret)); ret->escape_pending = 0; ret->escape_char = escape_char; return (void *)ret; |