All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Andreas Schwab <schwab@suse.de>
Cc: alsa-devel@alsa-project.org
Subject: Re: [PATCH] snd_user_file: fix memory leak
Date: Mon, 03 Nov 2014 17:31:05 +0100	[thread overview]
Message-ID: <s5h4mugb60m.wl-tiwai@suse.de> (raw)
In-Reply-To: <mvmtx2ggsor.fsf@hawking.suse.de>

At Mon, 03 Nov 2014 17:22:28 +0100,
Andreas Schwab wrote:
> 
> Call wordfree if and only if wordfree returns zero or WRDE_NOSPACE
> 
> Signed-off-by: Andreas Schwab <schwab@suse.de>

Thanks, applied.


Takashi

> ---
>  src/userfile.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/userfile.c b/src/userfile.c
> index 3a73836..72779da 100644
> --- a/src/userfile.c
> +++ b/src/userfile.c
> @@ -44,19 +44,20 @@ int snd_user_file(const char *file, char **result)
>  	err = wordexp(file, &we, WRDE_NOCMD);
>  	switch (err) {
>  	case WRDE_NOSPACE:
> +		wordfree(&we);
>  		return -ENOMEM;
>  	case 0:
>  		if (we.we_wordc == 1)
>  			break;
> +		wordfree(&we);
>  		/* fall thru */
>  	default:
> -		wordfree(&we);
>  		return -EINVAL;
>  	}
>  	*result = strdup(we.we_wordv[0]);
> +	wordfree(&we);
>  	if (*result == NULL)
>  		return -ENOMEM;
> -	wordfree(&we);
>  	return 0;
>  }
>  
> -- 
> 2.1.3
> 
> -- 
> Andreas Schwab, SUSE Labs, schwab@suse.de
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

      reply	other threads:[~2014-11-03 16:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-03 16:22 [PATCH] snd_user_file: fix memory leak Andreas Schwab
2014-11-03 16:31 ` Takashi Iwai [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5h4mugb60m.wl-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=schwab@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.