mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-23 18:23:25 +08:00
upstream: We've standardized on memset over bzero, replace a couple
that had slipped in. ok deraadt markus djm. OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6
This commit is contained in:
parent
7f23f42123
commit
4d2c87b4d1
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: channels.c,v 1.397 2020/03/06 18:19:21 markus Exp $ */
|
||||
/* $OpenBSD: channels.c,v 1.398 2020/04/25 06:59:36 dtucker Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
@ -454,7 +454,7 @@ fwd_perm_clear(struct permission *perm)
|
||||
free(perm->host_to_connect);
|
||||
free(perm->listen_host);
|
||||
free(perm->listen_path);
|
||||
bzero(perm, sizeof(*perm));
|
||||
memset(perm, 0, sizeof(*perm));
|
||||
}
|
||||
|
||||
/* Returns an printable name for the specified forwarding permission list */
|
||||
|
4
misc.c
4
misc.c
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: misc.c,v 1.146 2020/01/28 01:49:36 djm Exp $ */
|
||||
/* $OpenBSD: misc.c,v 1.147 2020/04/25 06:59:36 dtucker Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
||||
* Copyright (c) 2005,2006 Damien Miller. All rights reserved.
|
||||
@ -2255,7 +2255,7 @@ ssh_signal(int signum, sshsig_t handler)
|
||||
struct sigaction sa, osa;
|
||||
|
||||
/* mask all other signals while in handler */
|
||||
bzero(&sa, sizeof(sa));
|
||||
memset(&sa, 0, sizeof(sa));
|
||||
sa.sa_handler = handler;
|
||||
sigfillset(&sa.sa_mask);
|
||||
if (signum != SIGALRM)
|
||||
|
Loading…
Reference in New Issue
Block a user