mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
libsubcmd: Fix memory leak in uniq()
[ Upstream commit ad30469a84
]
uniq() will write one command name over another causing the overwritten
string to be leaked. Fix by doing a pass that removes duplicates and a
second that removes the holes.
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Chenyuan Mi <cymi20@fudan.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231208000515.1693746-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
32a8243788
commit
0079078f5e
1 changed files with 14 additions and 4 deletions
|
@ -50,11 +50,21 @@ void uniq(struct cmdnames *cmds)
|
|||
if (!cmds->cnt)
|
||||
return;
|
||||
|
||||
for (i = j = 1; i < cmds->cnt; i++)
|
||||
if (strcmp(cmds->names[i]->name, cmds->names[i-1]->name))
|
||||
cmds->names[j++] = cmds->names[i];
|
||||
|
||||
for (i = 1; i < cmds->cnt; i++) {
|
||||
if (!strcmp(cmds->names[i]->name, cmds->names[i-1]->name))
|
||||
zfree(&cmds->names[i - 1]);
|
||||
}
|
||||
for (i = 0, j = 0; i < cmds->cnt; i++) {
|
||||
if (cmds->names[i]) {
|
||||
if (i == j)
|
||||
j++;
|
||||
else
|
||||
cmds->names[j++] = cmds->names[i];
|
||||
}
|
||||
}
|
||||
cmds->cnt = j;
|
||||
while (j < i)
|
||||
cmds->names[j++] = NULL;
|
||||
}
|
||||
|
||||
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)
|
||||
|
|
Loading…
Reference in a new issue