summaryrefslogtreecommitdiffstats
path: root/usr.sbin/dhcpd/tree.c
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2010-01-01 20:30:24 +0000
committerkrw <krw@openbsd.org>2010-01-01 20:30:24 +0000
commit04b89754fa7bfb47963cc00764981d546152aafa (patch)
tree2630fdebccb4997efc1536faec0583cac240481a /usr.sbin/dhcpd/tree.c
parentMap the device registers before using them. We were lucky that some other (diff)
downloadwireguard-openbsd-04b89754fa7bfb47963cc00764981d546152aafa.tar.xz
wireguard-openbsd-04b89754fa7bfb47963cc00764981d546152aafa.zip
Wrappers around a wrapper around free() are of no more use than
wrappers around wrappers around calloc(). The purpose of the free() wrapper is to generate an error message when free'ing NULL. But free_hash_bucket(), free_lease(), and free_tree() are all called immediately after dereferencing the pointer to be freed. Thus the error message will never be issued.
Diffstat (limited to 'usr.sbin/dhcpd/tree.c')
-rw-r--r--usr.sbin/dhcpd/tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/dhcpd/tree.c b/usr.sbin/dhcpd/tree.c
index 3efde0858ea..e42e36bc3b6 100644
--- a/usr.sbin/dhcpd/tree.c
+++ b/usr.sbin/dhcpd/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.12 2010/01/01 18:01:44 krw Exp $ */
+/* $OpenBSD: tree.c,v 1.13 2010/01/01 20:30:25 krw Exp $ */
/* Routines for manipulating parse trees... */
@@ -122,7 +122,7 @@ tree_concat(struct tree *left, struct tree *right)
dfree(right->data.const_val.data, "tree_concat");
left->data.const_val.data = buf;
left->data.const_val.len += right->data.const_val.len;
- free_tree(right, "tree_concat");
+ free(right);
return left;
}