[master] cf7c39281 Duh: Never rush a fix.

[Dridi Boukelmoune]

On Thu, May 9, 2019 at 9:44 AM Poul-Henning Kamp <phk at freebsd.org> wrote:
>
>
> commit cf7c39281b392cabe81ad49d5221e53e65cc5337
> Author: Poul-Henning Kamp <phk at FreeBSD.org>
> Date:   Thu May 9 07:43:21 2019 +0000
>
>     Duh: Never rush a fix.

Looks better now, I think we can leave Coverity alone this time.

> diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
> index 4431dea0d..410fab9f3 100644
> --- a/lib/libvarnish/vss.c
> +++ b/lib/libvarnish/vss.c
> @@ -108,7 +108,7 @@ int
>  VSS_resolver_socktype(const char *addr, const char *def_port,
>      vss_resolved_f *func, void *priv, const char **err, int socktype)
>  {
> -       struct addrinfo hints, *res0 = NULL, *res;
> +       struct addrinfo hints, *res0, *res;
>         struct suckaddr *vsa;
>         char *h;
>         char *adp, *hop;
> @@ -143,8 +143,7 @@ VSS_resolver_socktype(const char *addr, const char *def_port,
>                                 break;
>                 }
>         }
> -       if (res0 != NULL)
> -               freeaddrinfo(res0);
> +       freeaddrinfo(res0);
>         return (ret);
>  }
>
> @@ -191,6 +190,7 @@ VSS_ResolveOne(void *dst, const char *addr, const char *port,
>                 else
>                         retval = VSA_Build(dst, res->ai_addr, res->ai_addrlen);
>         }
> -       freeaddrinfo(res);
> +       if (res != NULL)
> +               freeaddrinfo(res);
>         return (retval);
>  }
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit