svn commit: r299822 - head/sbin/routed

[Pedro F. Giffuni]

Author: pfg
Date: Sun May 15 02:41:20 2016
New Revision: 299822
URL: https://svnweb.freebsd.org/changeset/base/299822

Log:
  routed(8): Dereference before null check.
  
  CID:		272432
  Obtained from:	NetBSD (CVS ref. 1.16)
  MFC after:	2 weeks.

Modified:
  head/sbin/routed/rdisc.c

Modified: head/sbin/routed/rdisc.c
==============================================================================
--- head/sbin/routed/rdisc.c	Sun May 15 02:30:34 2016	(r299821)
+++ head/sbin/routed/rdisc.c	Sun May 15 02:41:20 2016	(r299822)
@@ -758,7 +758,7 @@ send_rdisc(union ad_u *p,
 	if (rdisc_sock < 0)
 		get_rdisc_sock();
 
-	trace_rdisc(msg, ifp->int_addr, rsin.sin_addr.s_addr, ifp,
+	trace_rdisc(msg, (ifp ? ifp->int_addr : 0), rsin.sin_addr.s_addr, ifp,
 		    p, p_size);
 
 	if (0 > sendto(rdisc_sock, p, p_size, flags,