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 1aacf4af7f
https://bugs.debian.org/894917
Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
parent
036ab9a3dd
commit
ac73415e32
4
NEWS
4
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
|
||||
|
2
pgrep.c
2
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);
|
||||
|
Loading…
Reference in New Issue
Block a user