From ba243e5155fd824dcd5235992e691017bd328b3f Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Sun, 2 Aug 2015 00:59:42 +0900 Subject: [PATCH] sd-bus: cleanup bus_reset_parsed_address() Both strv_free() and mfree() return NULL pointer after free. --- src/libsystemd/sd-bus/sd-bus.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index e7001686..0f07590 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -902,15 +902,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; } -- 2.7.4