summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c
index f30c8b6b5..fd3ff49e8 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.256 2013/11/20 20:54:10 deraadt Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.257 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
@@ -549,7 +549,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
549 gc->cb(type, seq, gc->ctx); 549 gc->cb(type, seq, gc->ctx);
550 if (--gc->ref_count <= 0) { 550 if (--gc->ref_count <= 0) {
551 TAILQ_REMOVE(&global_confirms, gc, entry); 551 TAILQ_REMOVE(&global_confirms, gc, entry);
552 bzero(gc, sizeof(*gc)); 552 explicit_bzero(gc, sizeof(*gc));
553 free(gc); 553 free(gc);
554 } 554 }
555 555
@@ -876,7 +876,7 @@ process_cmdline(void)
876 int cancel_port, ok; 876 int cancel_port, ok;
877 Forward fwd; 877 Forward fwd;
878 878
879 bzero(&fwd, sizeof(fwd)); 879 memset(&fwd, 0, sizeof(fwd));
880 fwd.listen_host = fwd.connect_host = NULL; 880 fwd.listen_host = fwd.connect_host = NULL;
881 881
882 leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE); 882 leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);