summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-04-25 06:59:36 +0000
committerDamien Miller <djm@mindrot.org>2020-05-01 13:13:28 +1000
commit4d2c87b4d1bde019cdd0f00552fcf97dd8b39940 (patch)
treece25a1bc0c9a5e389c0dd5dc460290010ed0e700 /misc.c
parent7f23f42123d64272a7b00754afa6b0841d676691 (diff)
upstream: We've standardized on memset over bzero, replace a couple
that had slipped in. ok deraadt markus djm. OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc.c b/misc.c
index 3a31d5c18..506507226 100644
--- a/misc.c
+++ b/misc.c
@@ -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)