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

0024-skill: Always NULL-terminate argv.

Browse Source 
The memmove() itself does not move the NULL-terminator, because nargs is
decremented first. Copy how skill_sig_option() does it: decrement nargs
last, and remove the "if (nargs - i)" (we are in "while (i < nargs)").
This commit is contained in:
Qualys Security Advisory 1970-01-01 00:00:00 +00:00 committed by Craig Small
parent fa7ea000ce
commit 18efff2a1f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
skill.c
View File

@ -374,10 +374,9 @@ static int snice_prio_option(int *argc, char **argv)
if (prio < INT_MIN || INT_MAX < prio) if (prio < INT_MIN || INT_MAX < prio)
xerrx(EXIT_FAILURE, xerrx(EXIT_FAILURE,
_("priority %lu out of range"), prio); _("priority %lu out of range"), prio);
memmove(argv + i, argv + i + 1,
sizeof(char *) * (nargs - i));
nargs--; nargs--;
if (nargs - i)
memmove(argv + i, argv + i + 1,
sizeof(char *) * (nargs - i));
} else } else
i++; i++;
} }