]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-bus: cleanup bus_reset_parsed_address() 834/head
authorNamhyung Kim <namhyung@gmail.com>
Sat, 1 Aug 2015 15:59:42 +0000 (00:59 +0900)
committerNamhyung Kim <namhyung@gmail.com>
Sun, 2 Aug 2015 14:12:08 +0000 (23:12 +0900)
Both strv_free() and mfree() return NULL pointer after free.

src/libsystemd/sd-bus/sd-bus.c

index e700168659726440a1a6c7978ac52d2d6807e871..0f075907d55d9f5926d0afe6fcfaa4d11f4a2c00 100644 (file)
@@ -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;
 }