summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpamela <pamela@openbsd.org>2019-08-26 18:50:04 +0000
committerpamela <pamela@openbsd.org>2019-08-26 18:50:04 +0000
commited6fb014d2d05fb0656dfee702e59810c9ef55a1 (patch)
tree70ac9f74539974fdfa7dc90daed9e4d7ef2d8d3b
parentDo not use the flow of the first fragment to store ECN information. (diff)
downloadwireguard-openbsd-ed6fb014d2d05fb0656dfee702e59810c9ef55a1.tar.xz
wireguard-openbsd-ed6fb014d2d05fb0656dfee702e59810c9ef55a1.zip
free(3) style functions should accept NULL and do nothing
OK florian
-rw-r--r--sbin/slaacd/engine.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sbin/slaacd/engine.c b/sbin/slaacd/engine.c
index 1dbc33f0422..f4d08df9c9b 100644
--- a/sbin/slaacd/engine.c
+++ b/sbin/slaacd/engine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.c,v 1.37 2019/06/27 09:48:15 florian Exp $ */
+/* $OpenBSD: engine.c,v 1.38 2019/08/26 18:50:04 pamela Exp $ */
/*
* Copyright (c) 2017 Florian Obser <florian@openbsd.org>
@@ -528,11 +528,7 @@ engine_dispatch_frontend(int fd, short event, void *bula)
addr_proposal = find_address_proposal_by_addr(iface,
&del_addr.addr);
- if (addr_proposal) {
- /* XXX should we inform netcfgd? */
- free_address_proposal(addr_proposal);
- }
-
+ free_address_proposal(addr_proposal);
break;
case IMSG_DEL_ROUTE:
if (IMSG_DATA_SIZE(imsg) != sizeof(del_route))
@@ -2091,6 +2087,8 @@ withdraw_dfr(struct dfr_proposal *dfr_proposal)
void
free_dfr_proposal(struct dfr_proposal *dfr_proposal)
{
+ if (dfr_proposal == NULL)
+ return;
LIST_REMOVE(dfr_proposal, entries);
evtimer_del(&dfr_proposal->timer);