system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf tools: Fix parse_events_error dereferences

Browse source 
Parse errors can be reported in struct parse_events_error but the
pointer passed is optional and can be NULL.  Ensure it is not NULL
before dereferencing it.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Link: http://lkml.kernel.org/r/1432040746-1755-4-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter 2015-05-19 16:05:44 +03:00 committed by Arnaldo Carvalho de Melo
parent bb78ce7d05
commit a6ced2be06
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/util/parse-events.c
View file

@ -1659,6 +1659,8 @@ void parse_events_evlist_error(struct parse_events_evlist *data,
{
struct parse_events_error *err = data->error;
if (!err)
return;
err->idx = idx;
err->str = strdup(str);
WARN_ONCE(!err->str, "WARNING: failed to allocate error string");

6
tools/perf/util/parse-events.y
View file

@ -389,8 +389,10 @@ PE_NAME ':' PE_NAME
if (parse_events_add_tracepoint(list, &data->idx, $1, $3)) {
struct parse_events_error *error = data->error;
error->idx = @1.first_column;
error->str = strdup("unknown tracepoint");
if (error) {
error->idx = @1.first_column;
error->str = strdup("unknown tracepoint");
}
return -1;
}
$$ = list;