diff options
-rw-r--r-- | channels.c | 4 | ||||
-rw-r--r-- | misc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/channels.c b/channels.c index 9683b3363..95a51e21b 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.397 2020/03/06 18:19:21 markus Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.398 2020/04/25 06:59:36 dtucker 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 |
@@ -454,7 +454,7 @@ fwd_perm_clear(struct permission *perm) | |||
454 | free(perm->host_to_connect); | 454 | free(perm->host_to_connect); |
455 | free(perm->listen_host); | 455 | free(perm->listen_host); |
456 | free(perm->listen_path); | 456 | free(perm->listen_path); |
457 | bzero(perm, sizeof(*perm)); | 457 | memset(perm, 0, sizeof(*perm)); |
458 | } | 458 | } |
459 | 459 | ||
460 | /* Returns an printable name for the specified forwarding permission list */ | 460 | /* Returns an printable name for the specified forwarding permission list */ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.146 2020/01/28 01:49:36 djm Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.147 2020/04/25 06:59:36 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -2255,7 +2255,7 @@ ssh_signal(int signum, sshsig_t handler) | |||
2255 | struct sigaction sa, osa; | 2255 | struct sigaction sa, osa; |
2256 | 2256 | ||
2257 | /* mask all other signals while in handler */ | 2257 | /* mask all other signals while in handler */ |
2258 | bzero(&sa, sizeof(sa)); | 2258 | memset(&sa, 0, sizeof(sa)); |
2259 | sa.sa_handler = handler; | 2259 | sa.sa_handler = handler; |
2260 | sigfillset(&sa.sa_mask); | 2260 | sigfillset(&sa.sa_mask); |
2261 | if (signum != SIGALRM) | 2261 | if (signum != SIGALRM) |