Re: [PATCH BlueZ v2 3/4] Fix memory leak when loading keys

[Johan Hedberg <johan.hedberg@gmail.com>]

Hi Vinicius,

On Wed, Jan 18, 2012, Vinicius Costa Gomes wrote:
> If we need a copy of those keys we should copy them.
> ---
>  plugins/hciops.c |   13 ++++++++++++-
>  1 files changed, 12 insertions(+), 1 deletions(-)

The two first patches have been applied but this one had some issues:

> diff --git a/plugins/hciops.c b/plugins/hciops.c
> index d4d219c..4e0729e 100644
> --- a/plugins/hciops.c
> +++ b/plugins/hciops.c
> @@ -3563,6 +3563,7 @@ static int hciops_restore_powered(int index)
>  static int hciops_load_keys(int index, GSList *keys, gboolean debug_keys)
>  {
>  	struct dev_info *dev = &devs[index];
> +	GSList *l, *new;
>  
>  	DBG("hci%d keys %d debug_keys %d", index, g_slist_length(keys),
>  								debug_keys);
> @@ -3570,7 +3571,17 @@ static int hciops_load_keys(int index, GSList *keys, gboolean debug_keys)
>  	if (dev->keys != NULL)
>  		return -EEXIST;
>  
> -	dev->keys = keys;
> +	for (new = NULL, l = keys; l; l = l->next) {
> +		struct link_key_info *orig, *dup;
> +
> +		orig = l->data;
> +
> +		dup = g_memdup(orig, sizeof(*orig));
> +
> +		new = g_slist_prepend(new, dup);
> +	}
> +
> +	dev->keys = new;
>  	dev->debug_keys = debug_keys;


In general I'm always a bit on guard with usage of C++ keywords like new
and class, but in this case instead of renaming you could just prepend
directly to dev->keys, i.e. there's no need for this temporary variable.

Johan