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

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."

diff --git a/pgrep.c b/pgrep.c
index 4199ac44d5226e010032a3d962638f39b2a07374..91ab14147883c1ba74e10cf8e9b4e9be7eb752eb 100644 (file)
--- a/pgrep.c
+++ b/pgrep.c
@@ -573,16 +573,18 @@ static struct el * select_procs (int *num)
 
                if (opt_long || opt_longlong || (match && opt_pattern)) {
                        if (opt_longlong && task.cmdline)
-                               strncpy (cmdoutput, cmdline, CMDSTRSIZE);
+                               strncpy (cmdoutput, cmdline, sizeof cmdoutput - 1);
                        else
-                               strncpy (cmdoutput, task.cmd, CMDSTRSIZE);
+                               strncpy (cmdoutput, task.cmd, sizeof cmdoutput - 1);
+                       cmdoutput[sizeof cmdoutput - 1] = '\0';
                }
 
                if (match && opt_pattern) {
                        if (opt_full && task.cmdline)
-                               strncpy (cmdsearch, cmdline, CMDSTRSIZE);
+                               strncpy (cmdsearch, cmdline, sizeof cmdsearch - 1);
                        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)
                                match = 0;