[PATCH] watch: Free service data in service_reply

[PATCH] watch: Free service data in service_reply

[Zhenhua Zhang]

[-- Attachment #1: Type: text/plain, Size: 765 bytes --]

Avoid the memory leak of server_data.
---
 gdbus/watch.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gdbus/watch.c b/gdbus/watch.c
index 1d479fa..ccdbb64 100644
--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -468,8 +468,10 @@ static void service_reply(DBusPendingCall *call, void *user_data)
 	dbus_bool_t has_owner;
 
 	reply = dbus_pending_call_steal_reply(call);
-	if (reply == NULL)
+	if (reply == NULL) {
+		g_free(data);
 		return;
+	}
 
 	dbus_error_init(&error);
 
@@ -490,6 +492,7 @@ static void service_reply(DBusPendingCall *call, void *user_data)
 
 done:
 	dbus_message_unref(reply);
+	g_free(data);
 }
 
 static void check_service(DBusConnection *connection, const char *name,
-- 
1.7.0.4

Re: [PATCH] watch: Free service data in service_reply

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

Hi Zhenhua,

> Avoid the memory leak of server_data.
> ---
>  gdbus/watch.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)

do me a favor and post this to linux-bluetooth(a)vger.kernel.org as well
for the Bluetooth guys to review. After that I can take of applying it
to all trees.

Regards

Marcel

Re: [PATCH] watch: Free service data in service_reply

[Johan Hedberg]

Hi,

On Sat, Jul 24, 2010, Zhenhua Zhang wrote:
> Avoid the memory leak of server_data.
> ---
>  gdbus/watch.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/gdbus/watch.c b/gdbus/watch.c
> index 1d479fa..ccdbb64 100644
> --- a/gdbus/watch.c
> +++ b/gdbus/watch.c
> @@ -468,8 +468,10 @@ static void service_reply(DBusPendingCall *call, void *user_data)
>  	dbus_bool_t has_owner;
>  
>  	reply = dbus_pending_call_steal_reply(call);
> -	if (reply == NULL)
> +	if (reply == NULL) {
> +		g_free(data);
>  		return;
> +	}
>  
>  	dbus_error_init(&error);
>  
> @@ -490,6 +492,7 @@ static void service_reply(DBusPendingCall *call, void *user_data)
>  
>  done:
>  	dbus_message_unref(reply);
> +	g_free(data);
>  }
>  
>  static void check_service(DBusConnection *connection, const char *name,

Thanks for the patch, but wouldnt't the following be simpler:

--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -533,7 +533,7 @@ static void check_service(DBusConnection *connection, const char *name,
 		goto done;
 	}
 
-	dbus_pending_call_set_notify(call, service_reply, data, NULL);
+	dbus_pending_call_set_notify(call, service_reply, data, g_free);
 
 	dbus_pending_call_unref(call);
 

Johan

[PATCH] watch: Free service data in service_reply

[Zhenhua Zhang]

Avoid the memory leak of server_data.
---
 gdbus/watch.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gdbus/watch.c b/gdbus/watch.c
index 1d479fa..ccdbb64 100644
--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -468,8 +468,10 @@ static void service_reply(DBusPendingCall *call, void *user_data)
 	dbus_bool_t has_owner;
 
 	reply = dbus_pending_call_steal_reply(call);
-	if (reply == NULL)
+	if (reply == NULL) {
+		g_free(data);
 		return;
+	}
 
 	dbus_error_init(&error);
 
@@ -490,6 +492,7 @@ static void service_reply(DBusPendingCall *call, void *user_data)
 
 done:
 	dbus_message_unref(reply);
+	g_free(data);
 }
 
 static void check_service(DBusConnection *connection, const char *name,
-- 
1.7.0.4