Re: [uml-user] [PATCH] um: fix returns without va_end

[Richard W. <ric...@gm...>]

On Tue, Dec 1, 2015 at 9:18 PM, Geyslan G. Bem <ge...@gm...> wrote:
> When using va_list ensure that va_start will be followed by va_end.
>
> Signed-off-by: Geyslan G. Bem <ge...@gm...>
> ---
>  arch/um/drivers/net_user.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
> index e697a41..e9f8445 100644
> --- a/arch/um/drivers/net_user.c
> +++ b/arch/um/drivers/net_user.c
> @@ -249,21 +249,23 @@ void close_addr(unsigned char *addr, unsigned char *netmask, void *arg)
>
>  char *split_if_spec(char *str, ...)
>  {
> -       char **arg, *end;
> +       char **arg, *end, *ret = NULL;
>         va_list ap;
>
>         va_start(ap, str);
>         while ((arg = va_arg(ap, char **)) != NULL) {
>                 if (*str == '\0')
> -                       return NULL;
> +                       goto out;
>                 end = strchr(str, ',');
>                 if (end != str)
>                         *arg = str;
>                 if (end == NULL)
> -                       return NULL;
> +                       goto out;
>                 *end++ = '\0';
>                 str = end;
>         }
> +       ret = str;
> +out:
>         va_end(ap);
> -       return str;
> +       return ret;
>  }

Applied! :)

-- 
Thanks,
//richard