[src/netbsd-1-5]: src/sys/netinet6 Pull up revision 1.13 (requested by itojun):

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/69b7a70c4011
branches:  netbsd-1-5
changeset: 490493:69b7a70c4011
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 16:17:17 2001 +0000

description:
Pull up revision 1.13 (requested by itojun):
  Don't dereference null ra_addr pointer.

diffstat:

 sys/netinet6/in6_prefix.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 8d6f1f5d4e85 -r 69b7a70c4011 sys/netinet6/in6_prefix.c
--- a/sys/netinet6/in6_prefix.c Thu Jan 25 16:06:24 2001 +0000
+++ b/sys/netinet6/in6_prefix.c Thu Jan 25 16:17:17 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_prefix.c,v 1.12 2000/06/07 06:27:43 itojun Exp $   */
+/*     $NetBSD: in6_prefix.c,v 1.12.2.1 2001/01/25 16:17:17 jhawk Exp $        */
 /*     $KAME: in6_prefix.c,v 1.29 2000/06/07 05:59:38 itojun Exp $     */
 
 /*
@@ -598,14 +598,16 @@
        if (ia6 != NULL) {
                if (ia6->ia6_ifpr == NULL) {
                        /* link this addr and the prefix each other */
-                       IFAFREE(&rap->ra_addr->ia_ifa);
+                       if (rap->ra_addr)
+                               IFAFREE(&rap->ra_addr->ia_ifa);
                        rap->ra_addr = ia6;
                        IFAREF(&rap->ra_addr->ia_ifa);
                        ia6->ia6_ifpr = rp2ifpr(rpp);
                        return;
                }
                if (ia6->ia6_ifpr == rp2ifpr(rpp)) {
-                       IFAFREE(&rap->ra_addr->ia_ifa);
+                       if (rap->ra_addr)
+                               IFAFREE(&rap->ra_addr->ia_ifa);
                        rap->ra_addr = ia6;
                        IFAREF(&rap->ra_addr->ia_ifa);
                        return;