diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2010-06-04 11:35:44 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2010-06-04 11:35:44 +0000 |
| commit | 6f138fc6e7d30828b49aac1867054afe01ffd608 (patch) | |
| tree | 6cec22347e92e4f7e9778bbe095d4a6a9eabc6fd | |
| parent | 69a5a3b71fe41336e74f82840300aa8bc5165cf7 (diff) | |
Missed this file in previous commit; previous commit message was:
rt_timer_queue_destroy() did not actually destroy, leading to a potential
memory leak due to misleading nomenclature. Change it to actually destroy,
not just clean, the the rt_timer_queue passed to it and adjust the correct
caller accordingly (i.e., no need to free the mem on our own now).
As a bonus, this gets rid of one of the ridiculous R_Malloc/Bzero/Free
cycles, and lets us sneak another bzero -> M_ZERO conversion in.
ok claudio@
| -rw-r--r-- | sys/netinet/ip_input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 999265cf042..23ed1aa375e 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.179 2010/05/07 13:33:17 claudio Exp $ */ +/* $OpenBSD: ip_input.c,v 1.180 2010/06/04 11:35:43 blambert Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -1619,7 +1619,6 @@ ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen) rt_timer_queue_create(ip_mtudisc_timeout); } else if (ip_mtudisc == 0 && ip_mtudisc_timeout_q != NULL) { rt_timer_queue_destroy(ip_mtudisc_timeout_q, TRUE); - Free(ip_mtudisc_timeout_q); ip_mtudisc_timeout_q = NULL; } return error; |