|
 |
17b0f1 |
From 68550741351080ab8458d54a6900b2b6ea1ef511 Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
|
|
|
17b0f1 |
Date: Sat, 9 May 2015 22:14:09 -0300
|
|
|
17b0f1 |
Subject: [PATCH] sd-bus: fix memory leak in test-bus-chat
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Building with address sanitizer enabled on GCC 5.1.x a memory leak
|
|
|
17b0f1 |
is reported because we never close the bus, fix it by using
|
|
|
17b0f1 |
cleanup variable attribute.
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Cherry-picked from: 2f50a2d55bf0a8b5959a6864ae1b39e7e9e0ce08
|
|
|
17b0f1 |
Related: #1331667
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
src/libsystemd/sd-bus/test-bus-chat.c | 4 +---
|
|
|
17b0f1 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
|
|
|
17b0f1 |
index 8625ee6d89..a80aaaeefe 100644
|
|
|
17b0f1 |
--- a/src/libsystemd/sd-bus/test-bus-chat.c
|
|
|
17b0f1 |
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
|
|
|
17b0f1 |
@@ -264,7 +264,7 @@ fail:
|
|
|
17b0f1 |
|
|
|
17b0f1 |
static void* client1(void*p) {
|
|
|
17b0f1 |
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
|
|
|
17b0f1 |
- sd_bus *bus = NULL;
|
|
|
17b0f1 |
+ _cleanup_bus_close_unref_ sd_bus *bus = NULL;
|
|
|
17b0f1 |
sd_bus_error error = SD_BUS_ERROR_NULL;
|
|
|
17b0f1 |
const char *hello;
|
|
|
17b0f1 |
int r;
|
|
|
17b0f1 |
@@ -347,8 +347,6 @@ finish:
|
|
|
17b0f1 |
else
|
|
|
17b0f1 |
sd_bus_send(bus, q, NULL);
|
|
|
17b0f1 |
|
|
|
17b0f1 |
- sd_bus_flush(bus);
|
|
|
17b0f1 |
- sd_bus_unref(bus);
|
|
|
17b0f1 |
}
|
|
|
17b0f1 |
|
|
|
17b0f1 |
sd_bus_error_free(&error);
|