diff options
| author | Ben Cheng <bccheng@google.com> | 2013-12-11 18:02:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-11 18:02:24 +0000 |
| commit | 39ccc63938f18fd33aa11bef7a7822af4f9c0735 (patch) | |
| tree | 234fd4e8ef8b5f46ab3df8e21b01479400608515 | |
| parent | 13dedc35d3e6b5da7e08291afcf23b319fe83ba1 (diff) | |
| parent | f5313ed0195f2882a8a204fa28a196be9fd20955 (diff) | |
| download | linux-tools-perf-39ccc63938f18fd33aa11bef7a7822af4f9c0735.tar.gz | |
Merge "Fix double-free in dso__set_basename()."
| -rw-r--r-- | perf-3.12.0/tools/perf/util/dso.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/perf-3.12.0/tools/perf/util/dso.c b/perf-3.12.0/tools/perf/util/dso.c index 0e18da0..6331ab0 100644 --- a/perf-3.12.0/tools/perf/util/dso.c +++ b/perf-3.12.0/tools/perf/util/dso.c @@ -403,10 +403,6 @@ static void dso__set_basename(struct dso *dso) if (!base) return; - if (dso->sname_alloc) - free((char *)dso->short_name); - else - dso->sname_alloc = 1; /* * basename may modify content, so we must pass * a copy. Moreover basename may return pointer to internal |