From c853caca3e5fddae2276561f74356a4ec54783e0 Mon Sep 17 00:00:00 2001
From: gnn <gnn@FreeBSD.org>
Date: Sun, 15 May 2005 02:28:30 +0000
Subject: Fixes for various nits found by the Coverity tool.

In particular 2 missed return values and an inappropriate bcopy from
a possibly NULL pointer.

Reviewed by:	jake
Approved by:	rwatson
MFC after:	1 week
---
 sys/netinet6/ip6_output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys/netinet6/ip6_output.c')

diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 36cfb28..265bd9e 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -2603,7 +2603,7 @@ ip6_copypktopts(src, canwait)
 	if (src->ip6po_nexthop) {
 		dst->ip6po_nexthop = malloc(src->ip6po_nexthop->sa_len,
 		    M_IP6OPT, canwait);
-		if (dst->ip6po_nexthop == NULL && canwait == M_NOWAIT)
+		if (dst->ip6po_nexthop == NULL)
 			goto bad;
 		bcopy(src->ip6po_nexthop, dst->ip6po_nexthop,
 		    src->ip6po_nexthop->sa_len);
-- 
cgit v1.1