diff options
author | Yunlong Song <yunlong.song@huawei.com> | 2015-02-13 08:11:52 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-02-13 09:38:43 -0500 |
commit | 3a03005ff9445834f3d3b577a11bcbdbdf7a89cf (patch) | |
tree | f187e14a6db1583991313a1ae1319e017415330b /tools/perf | |
parent | ceed252fe0b8b7975845ed4cb9e6069d8a12f233 (diff) |
perf tools: Fix a bug of segmentation fault
Fix the 'segmentation fault' bug of 'perf list --list-cmds', which also
happens in other cases (e.g. record, report ...). This bug happens when
there are no cmds to list at all.
Example:
Before this patch:
$ perf list --list-cmds
Segmentation fault
$
After this patch:
$ perf list --list-cmds
$
As shown above, the result prints nothing rather than a segmentation
fault. The null result means 'perf list' has no cmds to display at this
time.
Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1423833115-11199-5-git-send-email-yunlong.song@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/util/parse-options.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index 4a015f77e2b5..4ee9a86705ed 100644 --- a/tools/perf/util/parse-options.c +++ b/tools/perf/util/parse-options.c | |||
@@ -510,8 +510,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o | |||
510 | } | 510 | } |
511 | exit(130); | 511 | exit(130); |
512 | case PARSE_OPT_LIST_SUBCMDS: | 512 | case PARSE_OPT_LIST_SUBCMDS: |
513 | for (int i = 0; subcommands[i]; i++) | 513 | if (subcommands) { |
514 | printf("%s ", subcommands[i]); | 514 | for (int i = 0; subcommands[i]; i++) |
515 | printf("%s ", subcommands[i]); | ||
516 | } | ||
515 | exit(130); | 517 | exit(130); |
516 | default: /* PARSE_OPT_UNKNOWN */ | 518 | default: /* PARSE_OPT_UNKNOWN */ |
517 | if (ctx.argv[0][1] == '-') { | 519 | if (ctx.argv[0][1] == '-') { |