Module Name: src Committed By: christos Date: Thu Jun 5 17:11:54 UTC 2014
Modified Files: src/sys/netipsec: key.c Log Message: CID 274353: Forward NULL To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/netipsec/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netipsec/key.c diff -u src/sys/netipsec/key.c:1.88 src/sys/netipsec/key.c:1.89 --- src/sys/netipsec/key.c:1.88 Thu May 29 21:39:03 2014 +++ src/sys/netipsec/key.c Thu Jun 5 13:11:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.88 2014/05/30 01:39:03 christos Exp $ */ +/* $NetBSD: key.c,v 1.89 2014/06/05 17:11:54 christos Exp $ */ /* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.88 2014/05/30 01:39:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.89 2014/06/05 17:11:54 christos Exp $"); /* * This code is referd to RFC 2367 @@ -1772,7 +1772,7 @@ key_gather_mbuf(struct mbuf *m, const st } va_end(ap); - if ((result->m_flags & M_PKTHDR) != 0) { + if (result && (result->m_flags & M_PKTHDR) != 0) { result->m_pkthdr.len = 0; for (n = result; n; n = n->m_next) result->m_pkthdr.len += n->m_len;