summaryrefslogtreecommitdiff
path: root/src/libelogind
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2015-08-02 00:59:42 +0900
committerSven Eden <yamakuzure@gmx.net>2017-03-14 10:18:46 +0100
commit30e3bb6b4b8387fac4cef7eb99428bce1b785825 (patch)
treeabd306bdcd7d17bc8982bc747731fb793e3c50aa /src/libelogind
parent3fe46af0441993f00631e42b0d63c5951f9f81d6 (diff)
sd-bus: cleanup bus_reset_parsed_address()
Both strv_free() and mfree() return NULL pointer after free.
Diffstat (limited to 'src/libelogind')
-rw-r--r--src/libelogind/sd-bus/sd-bus.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index 68b872eb5..d2a96f87b 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -912,15 +912,11 @@ static void bus_reset_parsed_address(sd_bus *b) {
zero(b->sockaddr);
b->sockaddr_size = 0;
- strv_free(b->exec_argv);
- free(b->exec_path);
- b->exec_path = NULL;
- b->exec_argv = NULL;
+ b->exec_argv = strv_free(b->exec_argv);
+ b->exec_path = mfree(b->exec_path);
b->server_id = SD_ID128_NULL;
- free(b->kernel);
- b->kernel = NULL;
- free(b->machine);
- b->machine = NULL;
+ b->kernel = mfree(b->kernel);
+ b->machine = mfree(b->machine);
b->nspid = 0;
}