lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf hists browser: Fix possible memory leak

Browse Source 
The options array saves strings for each popup menu item.  The number of
items can be vary according to the currently selected item.  So it can
leak some memory if it's exited from a small item.  Fix it by freeing
all items when loop terminates.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1429687101-4360-4-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2015-04-22 16:18:14 +09:00 committed by Arnaldo Carvalho de Melo
parent d8a0f80042
commit f2b487db45
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/ui/browsers/hists.c
View File

@ -1424,7 +1424,8 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
struct hist_browser *browser = hist_browser__new(hists);
struct branch_info *bi;
struct pstack *fstack;
char *options[16];
#define MAX_OPTIONS 16
char *options[MAX_OPTIONS];
int nr_options = 0;
int key = -1;
char buf[64];
@ -1691,7 +1692,8 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
"Switch to another data file in PWD") > 0)
switch_data = nr_options++;
add_exit_option:
options[nr_options++] = (char *)"Exit";
if (asprintf(&options[nr_options], "Exit") > 0)
nr_options++;
retry_popup_menu:
choice = ui__popup_menu(nr_options, options);
@ -1812,7 +1814,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
pstack__delete(fstack);
out:
hist_browser__delete(browser);
free_popup_options(options, nr_options - 1);
free_popup_options(options, MAX_OPTIONS);
return key;
}