Module Name: src
Committed By: joerg
Date: Thu Feb 27 01:30:18 UTC 2014
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_htable.c
Log Message:
A member of a non-null struct pointer can't be null.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/ipf/netinet/ip_htable.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/external/bsd/ipf/netinet/ip_htable.c
diff -u src/sys/external/bsd/ipf/netinet/ip_htable.c:1.4 src/sys/external/bsd/ipf/netinet/ip_htable.c:1.5
--- src/sys/external/bsd/ipf/netinet/ip_htable.c:1.4 Sat Sep 14 11:41:45 2013
+++ src/sys/external/bsd/ipf/netinet/ip_htable.c Thu Feb 27 01:30:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_htable.c,v 1.4 2013/09/14 11:41:45 martin Exp $ */
+/* $NetBSD: ip_htable.c,v 1.5 2014/02/27 01:30:18 joerg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -60,7 +60,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_htable.c,v 1.4 2013/09/14 11:41:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_htable.c,v 1.5 2014/02/27 01:30:18 joerg Exp $");
#else
static const char rcsid[] = "@(#)Id: ip_htable.c,v 1.1.1.2 2012/07/22 13:45:19 darrenr Exp";
#endif
@@ -625,8 +625,7 @@ ipf_htent_remove(ipf_main_softc_t *softc
switch (iph->iph_type & ~IPHASH_ANON)
{
case IPHASH_GROUPMAP :
- if (ipe->ipe_group != NULL)
- ipf_group_del(softc, ipe->ipe_ptr, NULL);
+ ipf_group_del(softc, ipe->ipe_ptr, NULL);
break;
default :
