Date: Fri, 20 Aug 2010 22:19:37 +0400 From: pluknet <pluknet@gmail.com> To: Hajimu UMEMOTO <ume@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r211530 - head/sys/netinet6 Message-ID: <AANLkTikP29Z_vO%2BF_ShsVs2wLtF-isUt_=NLZeupwnye@mail.gmail.com> In-Reply-To: <201008201752.o7KHqnu1044143@svn.freebsd.org> References: <201008201752.o7KHqnu1044143@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 20 August 2010 21:52, Hajimu UMEMOTO <ume@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTikP29Z_vO%2BF_ShsVs2wLtF-isUt_=NLZeupwnye>