summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/channels.c b/channels.c
index e741f29b9..013accdc4 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.328 2013/12/19 01:04:36 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.329 2014/01/31 16:39:19 tedu 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
@@ -423,7 +423,7 @@ channel_free(Channel *c)
423 if (cc->abandon_cb != NULL) 423 if (cc->abandon_cb != NULL)
424 cc->abandon_cb(c, cc->ctx); 424 cc->abandon_cb(c, cc->ctx);
425 TAILQ_REMOVE(&c->status_confirms, cc, entry); 425 TAILQ_REMOVE(&c->status_confirms, cc, entry);
426 bzero(cc, sizeof(*cc)); 426 explicit_bzero(cc, sizeof(*cc));
427 free(cc); 427 free(cc);
428 } 428 }
429 if (c->filter_cleanup != NULL && c->filter_ctx != NULL) 429 if (c->filter_cleanup != NULL && c->filter_ctx != NULL)
@@ -2671,7 +2671,7 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
2671 return; 2671 return;
2672 cc->cb(type, c, cc->ctx); 2672 cc->cb(type, c, cc->ctx);
2673 TAILQ_REMOVE(&c->status_confirms, cc, entry); 2673 TAILQ_REMOVE(&c->status_confirms, cc, entry);
2674 bzero(cc, sizeof(*cc)); 2674 explicit_bzero(cc, sizeof(*cc));
2675 free(cc); 2675 free(cc);
2676} 2676}
2677 2677
@@ -3304,9 +3304,7 @@ channel_connect_ctx_free(struct channel_connect *cctx)
3304 free(cctx->host); 3304 free(cctx->host);
3305 if (cctx->aitop) 3305 if (cctx->aitop)
3306 freeaddrinfo(cctx->aitop); 3306 freeaddrinfo(cctx->aitop);
3307 bzero(cctx, sizeof(*cctx)); 3307 memset(cctx, 0, sizeof(*cctx));
3308 cctx->host = NULL;
3309 cctx->ai = cctx->aitop = NULL;
3310} 3308}
3311 3309
3312/* Return CONNECTING channel to remote host, port */ 3310/* Return CONNECTING channel to remote host, port */