Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932248AbbBRSly (ORCPT ); Wed, 18 Feb 2015 13:41:54 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41796 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbbBRSlv (ORCPT ); Wed, 18 Feb 2015 13:41:51 -0500 Date: Wed, 18 Feb 2015 10:41:32 -0800 From: tip-bot for Yunlong Song Message-ID: Cc: paulus@samba.org, wangnan0@huawei.com, mingo@kernel.org, yunlong.song@huawei.com, tglx@linutronix.de, acme@redhat.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: a.p.zijlstra@chello.nl, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, wangnan0@huawei.com, paulus@samba.org, yunlong.song@huawei.com, mingo@kernel.org In-Reply-To: <1423833115-11199-5-git-send-email-yunlong.song@huawei.com> References: <1423833115-11199-5-git-send-email-yunlong.song@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix a bug of segmentation fault Git-Commit-ID: 3a03005ff9445834f3d3b577a11bcbdbdf7a89cf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2090 Lines: 61 Commit-ID: 3a03005ff9445834f3d3b577a11bcbdbdf7a89cf Gitweb: http://git.kernel.org/tip/3a03005ff9445834f3d3b577a11bcbdbdf7a89cf Author: Yunlong Song AuthorDate: Fri, 13 Feb 2015 21:11:52 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 13 Feb 2015 11:38:43 -0300 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 Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1423833115-11199-5-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-options.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index 4a015f7..4ee9a86 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 } exit(130); case PARSE_OPT_LIST_SUBCMDS: - for (int i = 0; subcommands[i]; i++) - printf("%s ", subcommands[i]); + if (subcommands) { + for (int i = 0; subcommands[i]; i++) + printf("%s ", subcommands[i]); + } exit(130); default: /* PARSE_OPT_UNKNOWN */ if (ctx.argv[0][1] == '-') { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/