diff options
author | Wang Nan <wangnan0@huawei.com> | 2015-03-13 08:51:54 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-19 12:53:28 -0400 |
commit | 0c8c20779c5d56b93b8cb4cd30ba129a927ab437 (patch) | |
tree | 834448d6d5be440844e1ba755e6cf3a5832dfec6 /tools/perf/builtin-report.c | |
parent | 303cb89a6d708da9c24f6f3390ff68a2bd822a13 (diff) |
perf report: Don't allow empty argument for '-t'.
Without this patch, perf report cause segfault if pass "" as '-t':
$ perf report -t ""
# To display the perf.data header info, please use --header/--header-only options.
#
# Samples: 37 of event 'syscalls:sys_enter_write'
# Event count (approx.): 37
#
# Children SelfCommand Shared Object Symbol
Segmentation fault
Since -t is used to add field-separator for generate table, -t "" is
actually meanless. This patch defines a new OPT_STRING_NOEMPTY() option
generator to ensure user never pass empty string to that option.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: pi3orama@163.com
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Link: http://lkml.kernel.org/r/1426251114-198991-1-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r-- | tools/perf/builtin-report.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 52f74e1367e9..0ae482689e3c 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -676,7 +676,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) | |||
676 | OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str, | 676 | OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str, |
677 | "width[,width...]", | 677 | "width[,width...]", |
678 | "don't try to adjust column width, use these fixed values"), | 678 | "don't try to adjust column width, use these fixed values"), |
679 | OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator", | 679 | OPT_STRING_NOEMPTY('t', "field-separator", &symbol_conf.field_sep, "separator", |
680 | "separator for columns, no spaces will be added between " | 680 | "separator for columns, no spaces will be added between " |
681 | "columns '.' is reserved."), | 681 | "columns '.' is reserved."), |
682 | OPT_BOOLEAN('U', "hide-unresolved", &report.hide_unresolved, | 682 | OPT_BOOLEAN('U', "hide-unresolved", &report.hide_unresolved, |