emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

pgrep: Always null-terminate the cmd*[] buffers.

Browse Source 
Otherwise, man strncpy: "If there is no null byte among the first n
bytes of src, the string placed in dest will not be null-terminated."
This commit is contained in:
Qualys Security Advisory
-
committed by Craig Small
parent 35f58d8a3e
commit 40c4254318
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pgrep.c
View File

@ -573,16 +573,18 @@ static struct el * select_procs (int *num)
if (opt_long || opt_longlong || (match && opt_pattern)) { if (opt_long || opt_longlong || (match && opt_pattern)) {
if (opt_longlong && task.cmdline) if (opt_longlong && task.cmdline)
strncpy (cmdoutput, cmdline, CMDSTRSIZE); strncpy (cmdoutput, cmdline, sizeof cmdoutput - 1);
else else
strncpy (cmdoutput, task.cmd, CMDSTRSIZE); strncpy (cmdoutput, task.cmd, sizeof cmdoutput - 1);
cmdoutput[sizeof cmdoutput - 1] = '\0';
} }
if (match && opt_pattern) { if (match && opt_pattern) {
if (opt_full && task.cmdline) if (opt_full && task.cmdline)
strncpy (cmdsearch, cmdline, CMDSTRSIZE); strncpy (cmdsearch, cmdline, sizeof cmdsearch - 1);
else else
strncpy (cmdsearch, task.cmd, CMDSTRSIZE); strncpy (cmdsearch, task.cmd, sizeof cmdsearch - 1);
cmdsearch[sizeof cmdsearch - 1] = '\0';
if (regexec (preg, cmdsearch, 0, NULL, 0) != 0) if (regexec (preg, cmdsearch, 0, NULL, 0) != 0)
match = 0; match = 0;