[PATCH] perf: dso_load - move name malloc to when needed

[PATCH] perf: dso_load - move name malloc to when needed

[David Ahern]

memory is currently leaked on some paths.
---
 tools/perf/util/symbol.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 61edfd0..e9c0c3a 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -775,10 +775,6 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
 	else
 		machine = NULL;
 
-	name = malloc(PATH_MAX);
-	if (!name)
-		return -1;
-
 	dso->adjust_symbols = 0;
 
 	if (strncmp(dso->name, "/tmp/perf-", 10) == 0) {
@@ -802,6 +798,10 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
 	if (machine)
 		root_dir = machine->root_dir;
 
+	name = malloc(PATH_MAX);
+	if (!name)
+		return -1;
+
 	/* Iterate over candidate debug images.
 	 * Keep track of "interesting" ones (those which have a symtab, dynsym,
 	 * and/or opd section) for processing.
-- 
1.7.10.1

Re: [PATCH] perf: dso_load - move name malloc to when needed

[devendra.aaru]

On Mon, Jan 14, 2013 at 11:50 AM, David Ahern <dsahern@gmail.com> wrote:
> memory is currently leaked on some paths.

you are missing a signoff.

> ---
>  tools/perf/util/symbol.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
> index 61edfd0..e9c0c3a 100644
> --- a/tools/perf/util/symbol.c
> +++ b/tools/perf/util/symbol.c
> @@ -775,10 +775,6 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
>         else
>                 machine = NULL;
>
> -       name = malloc(PATH_MAX);
> -       if (!name)
> -               return -1;
> -
>         dso->adjust_symbols = 0;
>
>         if (strncmp(dso->name, "/tmp/perf-", 10) == 0) {
> @@ -802,6 +798,10 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
>         if (machine)
>                 root_dir = machine->root_dir;
>
> +       name = malloc(PATH_MAX);
> +       if (!name)
> +               return -1;
> +
>         /* Iterate over candidate debug images.
>          * Keep track of "interesting" ones (those which have a symtab, dynsym,
>          * and/or opd section) for processing.
> --
> 1.7.10.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/

Re: [PATCH] perf: dso_load - move name malloc to when needed

[David Ahern]

On 1/14/13 10:38 AM, devendra.aaru wrote:
> On Mon, Jan 14, 2013 at 11:50 AM, David Ahern <dsahern@gmail.com> wrote:
>> memory is currently leaked on some paths.
>
> you are missing a signoff.

grr.... did that on all 3. I'll resend.

David

[PATCH] perf: dso_load - move name malloc to when needed

[David Ahern]

memory is currently leaked on some paths.

Signed-off-by: David Ahern <dsahern@gmail.com>
---
 tools/perf/util/symbol.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 61edfd0..e9c0c3a 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -775,10 +775,6 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
 	else
 		machine = NULL;
 
-	name = malloc(PATH_MAX);
-	if (!name)
-		return -1;
-
 	dso->adjust_symbols = 0;
 
 	if (strncmp(dso->name, "/tmp/perf-", 10) == 0) {
@@ -802,6 +798,10 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
 	if (machine)
 		root_dir = machine->root_dir;
 
+	name = malloc(PATH_MAX);
+	if (!name)
+		return -1;
+
 	/* Iterate over candidate debug images.
 	 * Keep track of "interesting" ones (those which have a symtab, dynsym,
 	 * and/or opd section) for processing.
-- 
1.7.10.1