Module Name: src Committed By: snj Date: Sat Mar 18 05:13:22 UTC 2017
Modified Files: src/usr.bin/pkill [netbsd-7]: pkill.c Log Message: Pull up following revision(s) (requested by kre in ticket #1365): usr.bin/pkill/pkill.c: revision 1.31 PR bin/50934 -- avoid core dump if a process being examined has set its argv[0] to NULL. To generate a diff of this commit: cvs rdiff -u -r1.29.8.1 -r1.29.8.2 src/usr.bin/pkill/pkill.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/pkill/pkill.c diff -u src/usr.bin/pkill/pkill.c:1.29.8.1 src/usr.bin/pkill/pkill.c:1.29.8.2 --- src/usr.bin/pkill/pkill.c:1.29.8.1 Tue Jan 27 13:39:31 2015 +++ src/usr.bin/pkill/pkill.c Sat Mar 18 05:13:22 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: pkill.c,v 1.29.8.1 2015/01/27 13:39:31 martin Exp $ */ +/* $NetBSD: pkill.c,v 1.29.8.2 2017/03/18 05:13:22 snj Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: pkill.c,v 1.29.8.1 2015/01/27 13:39:31 martin Exp $"); +__RCSID("$NetBSD: pkill.c,v 1.29.8.2 2017/03/18 05:13:22 snj 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(®, buf, 1, ®match, 0); if (rv == 0) {