[PATCH] DTC: Fix memory leak on flatname.

[PATCH] DTC: Fix memory leak on flatname.

[Jean-Christophe Dubois]

If flatname was not referenced by the "node" structure, the reference to the
allocated string is lost at function exit.

We need to free it if is not used by "node".

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

diff --git a/flattree.c b/flattree.c
index ec14954..089b976 100644
--- a/flattree.c
+++ b/flattree.c
@@ -797,6 +797,10 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,
 		}
 	} while (val != FDT_END_NODE);
 
+	if (node->name != flatname) {
+		free(flatname);
+	}
+
 	return node;
 }
 
-- 
2.7.4

Re: [PATCH] DTC: Fix memory leak on flatname.

[David Gibson]

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

On Mon, Jul 11, 2016 at 12:16:52AM +0200, Jean-Christophe Dubois wrote:
> If flatname was not referenced by the "node" structure, the reference to the
> allocated string is lost at function exit.
> 
> We need to free it if is not used by "node".
> 
> Signed-off-by: Jean-Christophe Dubois <jcd-WBS85hRCVJbxB9160cZjhg@public.gmane.org>

TBH, I'm not generally particularly fussed by memory leaks in dtc,
since it only has a short runtime.  Still, I've applied this fix
because, why not.

> ---
>  flattree.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/flattree.c b/flattree.c
> index ec14954..089b976 100644
> --- a/flattree.c
> +++ b/flattree.c
> @@ -797,6 +797,10 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,
>  		}
>  	} while (val != FDT_END_NODE);
>  
> +	if (node->name != flatname) {
> +		free(flatname);
> +	}
> +
>  	return node;
>  }
>  

-- 
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 --]