Re: [systemd-devel] [PATCH] sd-bus: fix memory leak in test-bus-chat

2015-05-14 Thread Lennart Poettering
On Sat, 09.05.15 22:14, Cristian Rodríguez (crrodrig...@opensuse.org) wrote:

> Building with address sanitizer enabled on GCC 5.1.x a memory leak
> is reported because we never close the bus, fix it by using
> cleanup variable attribute.

Thanks! Applied!

> ---
>  src/libsystemd/sd-bus/test-bus-chat.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/src/libsystemd/sd-bus/test-bus-chat.c 
> b/src/libsystemd/sd-bus/test-bus-chat.c
> index 99261fa..1e50dfc 100644
> --- a/src/libsystemd/sd-bus/test-bus-chat.c
> +++ b/src/libsystemd/sd-bus/test-bus-chat.c
> @@ -262,7 +262,7 @@ fail:
>  
>  static void* client1(void*p) {
>  _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
> -sd_bus *bus = NULL;
> +_cleanup_bus_close_unref_ sd_bus *bus = NULL;
>  sd_bus_error error = SD_BUS_ERROR_NULL;
>  const char *hello;
>  int r;
> @@ -345,8 +345,6 @@ finish:
>  else
>  sd_bus_send(bus, q, NULL);
>  
> -sd_bus_flush(bus);
> -sd_bus_unref(bus);
>  }
>  
>  sd_bus_error_free(&error);
> -- 
> 2.3.7
> 
> ___
> systemd-devel mailing list
> systemd-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Lennart

-- 
Lennart Poettering, Red Hat
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] sd-bus: fix memory leak in test-bus-chat

2015-05-13 Thread Cristian Rodríguez
On Wed, May 13, 2015 at 8:01 AM, Daniel Mack  wrote:

> We should still keep this flush, right?
>
>> -sd_bus_unref(bus);
>>  }
>>

The cleanup function already does :

static inline void sd_bus_close_unrefp(sd_bus **bus) {
   if (*bus) {
   sd_bus_flush(*bus);
   sd_bus_close(*bus);
   sd_bus_unref(*bus);
   }
}

Or I am missing something ?
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] sd-bus: fix memory leak in test-bus-chat

2015-05-13 Thread Daniel Mack
On 05/10/2015 03:14 AM, Cristian Rodríguez wrote:
> Building with address sanitizer enabled on GCC 5.1.x a memory leak
> is reported because we never close the bus, fix it by using
> cleanup variable attribute.
> ---
>  src/libsystemd/sd-bus/test-bus-chat.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/src/libsystemd/sd-bus/test-bus-chat.c 
> b/src/libsystemd/sd-bus/test-bus-chat.c
> index 99261fa..1e50dfc 100644
> --- a/src/libsystemd/sd-bus/test-bus-chat.c
> +++ b/src/libsystemd/sd-bus/test-bus-chat.c
> @@ -262,7 +262,7 @@ fail:
>  
>  static void* client1(void*p) {
>  _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
> -sd_bus *bus = NULL;
> +_cleanup_bus_close_unref_ sd_bus *bus = NULL;
>  sd_bus_error error = SD_BUS_ERROR_NULL;
>  const char *hello;
>  int r;
> @@ -345,8 +345,6 @@ finish:
>  else
>  sd_bus_send(bus, q, NULL);
>  
> -sd_bus_flush(bus);

We should still keep this flush, right?

> -sd_bus_unref(bus);
>  }
>  
>  sd_bus_error_free(&error);
> 

Thanks,
Daniel

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] sd-bus: fix memory leak in test-bus-chat

2015-05-09 Thread systemd github import bot
Patchset imported to github.
Pull request:


--
Generated by https://github.com/haraldh/mail2git
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


[systemd-devel] [PATCH] sd-bus: fix memory leak in test-bus-chat

2015-05-09 Thread Cristian Rodríguez
Building with address sanitizer enabled on GCC 5.1.x a memory leak
is reported because we never close the bus, fix it by using
cleanup variable attribute.
---
 src/libsystemd/sd-bus/test-bus-chat.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c 
b/src/libsystemd/sd-bus/test-bus-chat.c
index 99261fa..1e50dfc 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -262,7 +262,7 @@ fail:
 
 static void* client1(void*p) {
 _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
-sd_bus *bus = NULL;
+_cleanup_bus_close_unref_ sd_bus *bus = NULL;
 sd_bus_error error = SD_BUS_ERROR_NULL;
 const char *hello;
 int r;
@@ -345,8 +345,6 @@ finish:
 else
 sd_bus_send(bus, q, NULL);
 
-sd_bus_flush(bus);
-sd_bus_unref(bus);
 }
 
 sd_bus_error_free(&error);
-- 
2.3.7

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel