remove NULL-checks before free()

5 files changed, 19 insertions, 27 deletions

diff --git a/lib/libpcap/gencode.c b/lib/libpcap/gencode.c
index ffcfd14d987..df09868fc90 100644
--- a/lib/libpcap/gencode.c
+++ b/lib/libpcap/gencode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencode.c,v 1.43 2015/11/17 21:39:23 mmcc Exp $	*/
+/*	$OpenBSD: gencode.c,v 1.44 2015/12/22 19:51:04 mmcc Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
@@ -208,11 +208,10 @@ freechunks()
 	int i;
 
 	cur_chunk = 0;
-	for (i = 0; i < NCHUNKS; ++i)
-		if (chunks[i].m != NULL) {
-			free(chunks[i].m);
-			chunks[i].m = NULL;
-		}
+	for (i = 0; i < NCHUNKS; ++i) {
+		free(chunks[i].m);
+		chunks[i].m = NULL;
+	}
 }
 
 /*
diff --git a/lib/libpcap/inet.c b/lib/libpcap/inet.c
index 12d8d74bad2..2a3da9d1d50 100644
--- a/lib/libpcap/inet.c
+++ b/lib/libpcap/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.23 2015/11/17 21:39:23 mmcc Exp $	*/
+/*	$OpenBSD: inet.c,v 1.24 2015/12/22 19:51:04 mmcc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996, 1997, 1998
@@ -82,14 +82,10 @@ pcap_freealldevs(pcap_if_t *alldevs)
 		for (curaddr = curdev->addresses; curaddr != NULL;
 		    curaddr = nextaddr) {
 			nextaddr = curaddr->next;
-			if (curaddr->addr)
-				free(curaddr->addr);
-			if (curaddr->netmask)
-				free(curaddr->netmask);
-			if (curaddr->broadaddr)
-				free(curaddr->broadaddr);
-			if (curaddr->dstaddr)
-				free(curaddr->dstaddr);
+			free(curaddr->addr);
+			free(curaddr->netmask);
+			free(curaddr->broadaddr);
+			free(curaddr->dstaddr);
 			free(curaddr);
 		}
 
@@ -101,8 +97,7 @@ pcap_freealldevs(pcap_if_t *alldevs)
 		/*
 		 * Free the description string, if any.
 		 */
-		if (curdev->description != NULL)
-			free(curdev->description);
+		free(curdev->description);
 
 		/*
 		 * Free the interface.
diff --git a/lib/libpcap/optimize.c b/lib/libpcap/optimize.c
index 509d6e9c38a..4572b2d9f02 100644
--- a/lib/libpcap/optimize.c
+++ b/lib/libpcap/optimize.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: optimize.c,v 1.17 2015/11/17 21:39:23 mmcc Exp $	*/
+/*	$OpenBSD: optimize.c,v 1.18 2015/12/22 19:51:04 mmcc Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996
@@ -2032,8 +2032,7 @@ filled:
 		++dst;
 		++off;
 	}
-	if (offset)
-		free(offset);
+	free(offset);
 
 #ifdef BDEBUG
 	bids[dst - fstart] = p->id + 1;
diff --git a/lib/libpcap/pcap-bpf.c b/lib/libpcap/pcap-bpf.c
index 06b715f79be..f6d658c386e 100644
--- a/lib/libpcap/pcap-bpf.c
+++ b/lib/libpcap/pcap-bpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcap-bpf.c,v 1.31 2015/11/17 21:39:23 mmcc Exp $	*/
+/*	$OpenBSD: pcap-bpf.c,v 1.32 2015/12/22 19:51:04 mmcc Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1998
@@ -416,10 +416,10 @@ pcap_cleanup_bpf(pcap_t *p)
 	}
 	if (p->sf.rfile != NULL) {
 		(void)fclose(p->sf.rfile);
-		if (p->sf.base != NULL)
-			free(p->sf.base);
-	} else if (p->buffer != NULL)
+		free(p->sf.base);
+	} else
 		free(p->buffer);
+
 	pcap_freecode(&p->fcode);
 	if (p->dlt_list != NULL) {
 		free(p->dlt_list);
diff --git a/lib/libpcap/savefile.c b/lib/libpcap/savefile.c
index 57350276ea4..2e6283939f7 100644
--- a/lib/libpcap/savefile.c
+++ b/lib/libpcap/savefile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: savefile.c,v 1.15 2015/11/17 21:39:23 mmcc Exp $	*/
+/*	$OpenBSD: savefile.c,v 1.16 2015/12/22 19:51:04 mmcc Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
@@ -257,8 +257,7 @@ sf_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char *buf, int buflen)
 
 		if (tsize < hdr->caplen) {
 			tsize = ((hdr->caplen + 1023) / 1024) * 1024;
-			if (tp != NULL)
-				free(tp);
+			free(tp);
 			tp = malloc(tsize);
 			if (tp == NULL) {
 				tsize = 0;