Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move 'utsname' to the main() function scope, so that the reference to 

it outside the block remains valid.

should fix an asan reported issue.
This commit is contained in:
mrg 2018-06-15 20:16:35 +00:00
parent 8889253054
commit 2951cf94c8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/man/man.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: man.c,v 1.66 2017/05/02 14:19:23 abhinav Exp $ */
/* $NetBSD: man.c,v 1.67 2018/06/15 20:16:35 mrg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
__RCSID("$NetBSD: man.c,v 1.66 2017/05/02 14:19:23 abhinav Exp $");
__RCSID("$NetBSD: man.c,v 1.67 2018/06/15 20:16:35 mrg Exp $");
#endif
#endif /* not lint */
@ -128,6 +128,7 @@ int
main(int argc, char **argv)
{
static struct manstate m;
struct utsname utsname;
int ch, abs_section, found;
ENTRY *esubd, *epath;
char *p, **ap, *cmd;
@ -204,8 +205,6 @@ main(int argc, char **argv)
config(m.conffile); /* exits on error ... */
if ((m.machine = getenv("MACHINE")) == NULL) {
struct utsname utsname;
if (uname(&utsname) == -1)
err(EXIT_FAILURE, "uname");
m.machine = utsname.machine;