From ac73415e32c171d434a5518fd1324ec248f8d0fb Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Wed, 11 Apr 2018 00:00:00 -0500 Subject: [PATCH] pgrep: Don't segfault with no match _______ (catch up) --------------- Original Master Branch Commit Message: If pgrep is run with a non-program name match and there are no matches, it segfaults. The testsuite thinks zero bytes sent, and zero bytes sent because the program crashed is the same :/ References: commit 1aacf4af7f199d77fc9386e249eee654f59880db https://bugs.debian.org/894917 Signed-off-by: Jim Warner --- NEWS | 4 ++++ pgrep.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 41032e37..681d9d04 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +procps-ng-3.3.14 +---------------- + * pgrep: Don't segfault on non match Debian #894917 + procps-ng-3.3.13 ---------------- * library: Increment to 7:0:1 diff --git a/pgrep.c b/pgrep.c index 051457ef..004b6243 100644 --- a/pgrep.c +++ b/pgrep.c @@ -592,7 +592,7 @@ static struct el * select_procs (int *num) *num = matches; - if ((!opt_full) && (strlen(opt_pattern) > 15)) + if ((!matches) && (!opt_full) && opt_pattern && (strlen(opt_pattern) > 15)) xwarnx(_("pattern that searches for process name longer than 15 characters will result in zero matches\n" "Try `%s -f' option to match against the complete command line."), program_invocation_short_name); -- 2.40.0