From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752632AbbCVKOV (ORCPT ); Sun, 22 Mar 2015 06:14:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57229 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752079AbbCVKOR (ORCPT ); Sun, 22 Mar 2015 06:14:17 -0400 Date: Sun, 22 Mar 2015 03:14:03 -0700 From: tip-bot for Wang Nan Message-ID: Cc: lizefan@huawei.com, namhyung@kernel.org, wangnan0@huawei.com, acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de Reply-To: hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org, lizefan@huawei.com, wangnan0@huawei.com, acme@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <1426820272-23302-1-git-send-email-wangnan0@huawei.com> References: <1426820272-23302-1-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Don' t allow empty argument for field-separator Git-Commit-ID: 8b8ca6e15e392b366a7d69c6bf1abaae005f2b63 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 Commit-ID: 8b8ca6e15e392b366a7d69c6bf1abaae005f2b63 Gitweb: http://git.kernel.org/tip/8b8ca6e15e392b366a7d69c6bf1abaae005f2b63 Author: Wang Nan AuthorDate: Fri, 20 Mar 2015 02:57:52 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 20 Mar 2015 17:49:51 -0300 perf tools: Don't allow empty argument for field-separator Both 'perf diff' and 'perf mem' have 'field-separator' option, which causes segfault if passed with empty string. This patch uses previously introduced 'OPT_STRING_NOEMPTY' option macro to prevent fault. Signed-off-by: Wang Nan Tested-by: Arnaldo Carvalho de Melo Cc: pi3orama@163.com Cc: Namhyung Kim Cc: Zefan Li Link: http://lkml.kernel.org/r/1426820272-23302-1-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-mem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index f800fc9..473887d 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -802,7 +802,7 @@ static const struct option options[] = { OPT_STRING('s', "sort", &sort_order, "key[,key2...]", "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline, ..." " Please refer the man page for the complete list."), - OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator", + OPT_STRING_NOEMPTY('t', "field-separator", &symbol_conf.field_sep, "separator", "separator for columns, no spaces will be added between " "columns '.' is reserved."), OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index 46c6931..b4dcf0b 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -286,7 +286,7 @@ int cmd_mem(int argc, const char **argv, const char *prefix __maybe_unused) "input file name"), OPT_STRING('C', "cpu", &mem.cpu_list, "cpu", "list of cpus to profile"), - OPT_STRING('x', "field-separator", &symbol_conf.field_sep, + OPT_STRING_NOEMPTY('x', "field-separator", &symbol_conf.field_sep, "separator", "separator for columns, no spaces will be added" " between columns '.' is reserved."),