From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbbHMIEz (ORCPT ); Thu, 13 Aug 2015 04:04:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51121 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052AbbHMIEd (ORCPT ); Thu, 13 Aug 2015 04:04:33 -0400 Date: Thu, 13 Aug 2015 01:04:21 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, ak@linux.intel.com, mingo@kernel.org, hpa@zytor.com, namhyung@kernel.org, jolsa@kernel.org Reply-To: linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, jolsa@kernel.org, namhyung@kernel.org, ak@linux.intel.com In-Reply-To: <20150811133655.GC4524@tassilo.jf.intel.com> References: <20150811133655.GC4524@tassilo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf sort: Check for SRCLINE_UNKNOWN case in " srcfile" processing Git-Commit-ID: 76b10655818c939e257377f83992975a5f55ffb3 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: 76b10655818c939e257377f83992975a5f55ffb3 Gitweb: http://git.kernel.org/tip/76b10655818c939e257377f83992975a5f55ffb3 Author: Andi Kleen AuthorDate: Tue, 11 Aug 2015 06:36:55 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 12 Aug 2015 10:27:02 -0300 perf sort: Check for SRCLINE_UNKNOWN case in "srcfile" processing Handle the SRCLINE_UNKNOWN case correctly when processing "srcfile". Commiter note: We can't just free it, as it was't allocated via malloc, its a guard variable. Reported-by: Namhyung Kim Signed-off-by: Andi Kleen Cc: Jiri Olsa Link: http://lkml.kernel.org/r/20150811133655.GC4524@tassilo.jf.intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/sort.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index c0c32b0..7e38716 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -330,6 +330,8 @@ static char *get_srcfile(struct hist_entry *e) sf = get_srcline(map->dso, map__rip_2objdump(map, e->ip), e->ms.sym, true); + if (!strcmp(sf, SRCLINE_UNKNOWN)) + return no_srcfile; p = strchr(sf, ':'); if (p && *sf) { *p = 0;