svn commit: r211530 - head/sys/netinet6

[pluknet]

On 20 August 2010 21:52, Hajimu UMEMOTO <ume at freebsd.org> wrote:
> Author: ume
> Date: Fri Aug 20 17:52:49 2010
> New Revision: 211530
> URL: http://svn.freebsd.org/changeset/base/211530
>
> Log:
>  optp may be NULL.
>
> Modified:
>  head/sys/netinet6/raw_ip6.c
>
> Modified: head/sys/netinet6/raw_ip6.c
> ==============================================================================
> --- head/sys/netinet6/raw_ip6.c Fri Aug 20 17:20:05 2010        (r211529)
> +++ head/sys/netinet6/raw_ip6.c Fri Aug 20 17:52:49 2010        (r211530)
> @@ -434,7 +434,8 @@ rip6_output(m, va_alist)
>         * XXX: we may still need to determine the zone later.
>         */
>        if (!(so->so_state & SS_ISCONNECTED)) {
> -               if (!optp->ip6po_pktinfo || !optp->ip6po_pktinfo->ipi6_ifindex)
> +               if (!optp || !optp->ip6po_pktinfo ||
> +                   !optp->ip6po_pktinfo->ipi6_ifindex)

Hi.

I think it still continues to test the remain condition
regardless of test result of the first part (!optp).

That should work:

 -               if (!optp->ip6po_pktinfo || !optp->ip6po_pktinfo->ipi6_ifindex)
 +               if (optp != NULL && (!optp->ip6po_pktinfo ||
 +                   !optp->ip6po_pktinfo->ipi6_ifindex))

-- 
wbr,
pluknet