[PATCH] livetree.c: Fix memory leak

[PATCH] livetree.c: Fix memory leak

[Jean-Christophe Dubois]

When running coverity on dtc source code the following error is reported.

==========================================================================
*** CID 1370967:  Resource leaks  (RESOURCE_LEAK)
/tools/dtc/livetree.c: 850 in add_fixup_entry()
844		if (strchr(node->fullpath, ':') || strchr(prop->name, ':'))
845			die("arguments should not contain ':'\n");
846
847		xasprintf(&entry, "%s:%s:%u",
848			  node->fullpath, prop->name, m->offset);
849		append_to_property(fn, m->ref, entry, strlen(entry) + 1);
>>>     CID 1370967:  Resource leaks  (RESOURCE_LEAK)
>>>     Variable "entry" going out of scope leaks the storage it points to.
850     }
==========================================================================

Fix the leak.

Signed-off-by: Jean-Christophe Dubois <jcd-WBS85hRCVJbxB9160cZjhg@public.gmane.org>
---
 livetree.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/livetree.c b/livetree.c
index afa2f67..994b6c2 100644
--- a/livetree.c
+++ b/livetree.c
@@ -847,6 +847,8 @@ static void add_fixup_entry(struct dt_info *dti, struct node *fn,
 	xasprintf(&entry, "%s:%s:%u",
 			node->fullpath, prop->name, m->offset);
 	append_to_property(fn, m->ref, entry, strlen(entry) + 1);
+
+	free(entry);
 }
 
 static void generate_fixups_tree_internal(struct dt_info *dti,
-- 
2.9.3

Re: [PATCH] livetree.c: Fix memory leak

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]

On Tue, Feb 07, 2017 at 10:26:25PM +0100, Jean-Christophe Dubois wrote:
> When running coverity on dtc source code the following error is reported.
> 
> ==========================================================================
> *** CID 1370967:  Resource leaks  (RESOURCE_LEAK)
> /tools/dtc/livetree.c: 850 in add_fixup_entry()
> 844		if (strchr(node->fullpath, ':') || strchr(prop->name, ':'))
> 845			die("arguments should not contain ':'\n");
> 846
> 847		xasprintf(&entry, "%s:%s:%u",
> 848			  node->fullpath, prop->name, m->offset);
> 849		append_to_property(fn, m->ref, entry, strlen(entry) + 1);
> >>>     CID 1370967:  Resource leaks  (RESOURCE_LEAK)
> >>>     Variable "entry" going out of scope leaks the storage it points to.
> 850     }
> ==========================================================================
> 
> Fix the leak.
> 
> Signed-off-by: Jean-Christophe Dubois <jcd-WBS85hRCVJbxB9160cZjhg@public.gmane.org>

Applied, thanks.

> ---
>  livetree.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/livetree.c b/livetree.c
> index afa2f67..994b6c2 100644
> --- a/livetree.c
> +++ b/livetree.c
> @@ -847,6 +847,8 @@ static void add_fixup_entry(struct dt_info *dti, struct node *fn,
>  	xasprintf(&entry, "%s:%s:%u",
>  			node->fullpath, prop->name, m->offset);
>  	append_to_property(fn, m->ref, entry, strlen(entry) + 1);
> +
> +	free(entry);
>  }
>  
>  static void generate_fixups_tree_internal(struct dt_info *dti,

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]