redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

perf trace scripting: fix some small memory leaks and missing error checks

Browse source 
Free the other two fields of script_desc which somehow got overlooked,
free malloc'ed args in case exec fails, and add missing checks for
failed mallocs.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
This commit is contained in:
Tom Zanussi 2010-11-10 07:52:32 -06:00
parent 01797c5998
commit e8719adf30
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/perf/builtin-trace.c
View file

@ -337,6 +337,8 @@ static struct script_desc *script_desc__new(const char *name)
static void script_desc__delete(struct script_desc *s)
{
free(s->name);
free(s->half_liner);
free(s->args);
free(s);
}
@ -626,6 +628,9 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
close(live_pipe[0]);
__argv = malloc(6 * sizeof(const char *));
if (!__argv)
die("malloc");
__argv[0] = "/bin/sh";
__argv[1] = record_script_path;
__argv[2] = "-q";
@ -634,6 +639,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
__argv[5] = NULL;
execvp("/bin/sh", (char **)__argv);
free(__argv);
exit(-1);
}
@ -641,6 +647,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
close(live_pipe[1]);
__argv = malloc((argc + 3) * sizeof(const char *));
if (!__argv)
die("malloc");
__argv[0] = "/bin/sh";
__argv[1] = report_script_path;
for (i = 2; i < argc; i++)
@ -650,6 +658,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
__argv[i++] = NULL;
execvp("/bin/sh", (char **)__argv);
free(__argv);
exit(-1);
}
@ -661,6 +670,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
}
__argv = malloc((argc + 1) * sizeof(const char *));
if (!__argv)
die("malloc");
__argv[0] = "/bin/sh";
__argv[1] = script_path;
for (i = 3; i < argc; i++)
@ -668,6 +679,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
__argv[argc - 1] = NULL;
execvp("/bin/sh", (char **)__argv);
free(__argv);
exit(-1);
}