Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/sys/netinet6 Pull up revision 1.38 (requested by itojun...



details:   https://anonhg.NetBSD.org/src/rev/ae25dffbd91a
branches:  netbsd-1-6
changeset: 530800:ae25dffbd91a
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Oct 02 20:46:39 2003 +0000

description:
Pull up revision 1.38 (requested by itojun in ticket #1501):
do not deref state.ro if it is NULL

diffstat:

 sys/netinet6/ip6_forward.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 051375702eb8 -r ae25dffbd91a sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c        Thu Oct 02 20:41:56 2003 +0000
+++ b/sys/netinet6/ip6_forward.c        Thu Oct 02 20:46:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_forward.c,v 1.27.10.1 2003/10/02 20:37:32 tron Exp $       */
+/*     $NetBSD: ip6_forward.c,v 1.27.10.2 2003/10/02 20:46:39 tron Exp $       */
 /*     $KAME: ip6_forward.c,v 1.74 2001/06/12 23:54:55 itojun Exp $    */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.27.10.1 2003/10/02 20:37:32 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.27.10.2 2003/10/02 20:46:39 tron Exp $");
 
 #include "opt_ipsec.h"
 #include "opt_pfil_hooks.h"
@@ -288,7 +288,7 @@
 
        /* adjust pointer */
        ip6 = mtod(m, struct ip6_hdr *);
-       rt = state.ro->ro_rt;
+       rt = state.ro ? state.ro->ro_rt : NULL;
        dst = (struct sockaddr_in6 *)state.dst;
        if (dst != NULL && rt != NULL)
                ipsecrt = 1;



Home | Main Index | Thread Index | Old Index