MFV r257952:
Upgrade to OpenSSH 6.4p1. Bump VersionAddendum. Approved by: des
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user