From a97b23d65a1800876a58235966f04e02f16f7f4d Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 22 Dec 2015 11:03:53 +0100 Subject: socket: free fdname member Plug a small memory leak. --- src/core/socket.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core') diff --git a/src/core/socket.c b/src/core/socket.c index 7beec3644e..fb7632dee8 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -165,6 +165,8 @@ static void socket_done(Unit *u) { free(s->user); free(s->group); + s->fdname = mfree(s->fdname); + s->timer_event_source = sd_event_source_unref(s->timer_event_source); } -- cgit v1.2.3-54-g00ecf From 0a78712e819f2db29809ec752bf96c2c1012a181 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 22 Dec 2015 11:32:25 +0100 Subject: socket: nullify pointers after free A socket shouldn't be used after socket_done() returns, but follow the general guideline here and avoid dangling pointers anyway. --- src/core/socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core') diff --git a/src/core/socket.c b/src/core/socket.c index fb7632dee8..d6b0c963e8 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -156,14 +156,14 @@ static void socket_done(Unit *u) { s->tcp_congestion = mfree(s->tcp_congestion); s->bind_to_device = mfree(s->bind_to_device); - free(s->smack); - free(s->smack_ip_in); - free(s->smack_ip_out); + s->smack = mfree(s->smack); + s->smack_ip_in = mfree(s->smack_ip_in); + s->smack_ip_out = mfree(s->smack_ip_out); strv_free(s->symlinks); - free(s->user); - free(s->group); + s->user = mfree(s->user); + s->group = mfree(s->group); s->fdname = mfree(s->fdname); -- cgit v1.2.3-54-g00ecf