PR bin/50934 -- avoid core dump if a process being examined has set

its argv[0] to NULL.

XXX Needs pullups netbsd-7-0 and netbsd-7 (bug was introduced after
    netbsd-6 and never pulled up, so no netbsd-6 pullups required.)
This commit is contained in:
kre 2017-02-21 13:09:56 +00:00
parent 0d311d094e
commit d7b1a047f9

View File

@ -1,4 +1,4 @@
/* $NetBSD: pkill.c,v 1.30 2015/01/09 12:45:32 prlw1 Exp $ */
/* $NetBSD: pkill.c,v 1.31 2017/02/21 13:09:56 kre Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: pkill.c,v 1.30 2015/01/09 12:45:32 prlw1 Exp $");
__RCSID("$NetBSD: pkill.c,v 1.31 2017/02/21 13:09:56 kre Exp $");
#endif /* !lint */
#include <sys/types.h>
@ -296,8 +296,10 @@ main(int argc, char **argv)
pargv[0]);
pargv++;
}
} else
} else if (pargv[0] != NULL)
strlcpy(buf, pargv[0], sizeof(buf));
else
strlcpy(buf, kp->p_comm, sizeof(buf));
rv = regexec(&reg, buf, 1, &regmatch, 0);
if (rv == 0) {