linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for David Ahern <dsahern@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
	mingo@kernel.org, penberg@kernel.org, dsahern@gmail.com,
	irina.tirdea@gmail.com, tglx@linutronix.de
Subject: [tip:perf/core] perf annotate: Make a copy of filename for passing to basename
Date: Sun, 9 Sep 2012 01:59:17 -0700	[thread overview]
Message-ID: <tip-bfd14b9a7231e7cf77520bca1848c40c6b6360ae@git.kernel.org> (raw)
In-Reply-To: <1347116812-93646-2-git-send-email-dsahern@gmail.com>

Commit-ID:  bfd14b9a7231e7cf77520bca1848c40c6b6360ae
Gitweb:     http://git.kernel.org/tip/bfd14b9a7231e7cf77520bca1848c40c6b6360ae
Author:     David Ahern <dsahern@gmail.com>
AuthorDate: Sat, 8 Sep 2012 09:06:50 -0600
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Sat, 8 Sep 2012 17:14:43 -0300

perf annotate: Make a copy of filename for passing to basename

The basename function may modify the string passed to it, so the string
should not be marked const.

Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Irina Tirdea <irina.tirdea@gmail.com>
Cc: Pekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1347116812-93646-2-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/annotate.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 51ef69c..04eafd3 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -984,7 +984,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,
 			    int context)
 {
 	struct dso *dso = map->dso;
-	const char *filename = dso->long_name, *d_filename;
+	char *filename;
+	const char *d_filename;
 	struct annotation *notes = symbol__annotation(sym);
 	struct disasm_line *pos, *queue = NULL;
 	u64 start = map__rip_2objdump(map, sym->start);
@@ -992,6 +993,10 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,
 	int more = 0;
 	u64 len;
 
+	filename = strdup(dso->long_name);
+	if (!filename)
+		return -ENOMEM;
+
 	if (full_paths)
 		d_filename = filename;
 	else
@@ -1042,6 +1047,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,
 		}
 	}
 
+	free(filename);
+
 	return more;
 }
 

  reply	other threads:[~2012-09-09  8:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-08 15:06 [PATCH 0/3] perf tool: basename cleanups David Ahern
2012-09-08 15:06 ` [PATCH 1/3] perf annotate: make a copy of filename for passing to basename David Ahern
2012-09-09  8:59   ` tip-bot for David Ahern [this message]
2012-09-08 15:06 ` [PATCH 2/3] perf probe: make a copy of exec path " David Ahern
2012-09-09  9:00   ` [tip:perf/core] perf probe: Make " tip-bot for David Ahern
2012-09-08 15:06 ` [PATCH 3/3] perf tool: remove BIONIC wrapper around libgen.h David Ahern
2012-09-09  9:01   ` [tip:perf/core] perf symbols: Remove BIONIC wrapper around libgen. h tip-bot for David Ahern
2012-09-08 16:24 ` [PATCH 0/3] perf tool: basename cleanups Pekka Enberg
2012-09-08 22:25 ` Irina Tirdea

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-bfd14b9a7231e7cf77520bca1848c40c6b6360ae@git.kernel.org \
    --to=dsahern@gmail.com \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=irina.tirdea@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=penberg@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).