[PATCH] connman: Fix crash while requesting and releasing private network

[PATCH] connman: Fix crash while requesting and releasing private network

[Guillaume Zajac]

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

---
 plugins/connman.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/connman.c b/plugins/connman.c
index 3a3429f..8ad6815 100644
--- a/plugins/connman.c
+++ b/plugins/connman.c
@@ -119,7 +119,7 @@ static gboolean parse_reply(DBusMessage *reply, const char **path,
 	if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_OBJECT_PATH)
 		return FALSE;
 
-	dbus_message_iter_get_basic(&array, &path);
+	dbus_message_iter_get_basic(&array, path);
 
 	dbus_message_iter_next(&array);
 	if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
@@ -186,7 +186,7 @@ static void request_reply(DBusPendingCall *call, void *user_data)
 	if (reply == NULL)
 		goto badreply;
 
-	if (parse_reply(dbus_pending_call_steal_reply(call),
+	if (parse_reply(reply,
 			&path, &pns) == FALSE)
 		goto error;
 
-- 
1.7.1

[PATCH_v2] connman: Fix crash while requesting and releasing private network

[Guillaume Zajac]

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

This v2 fixes indentation issue.

---
 plugins/connman.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/connman.c b/plugins/connman.c
index 3a3429f..bb29cd5 100644
--- a/plugins/connman.c
+++ b/plugins/connman.c
@@ -119,7 +119,7 @@ static gboolean parse_reply(DBusMessage *reply, const char **path,
 	if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_OBJECT_PATH)
 		return FALSE;
 
-	dbus_message_iter_get_basic(&array, &path);
+	dbus_message_iter_get_basic(&array, path);
 
 	dbus_message_iter_next(&array);
 	if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
@@ -186,8 +186,7 @@ static void request_reply(DBusPendingCall *call, void *user_data)
 	if (reply == NULL)
 		goto badreply;
 
-	if (parse_reply(dbus_pending_call_steal_reply(call),
-			&path, &pns) == FALSE)
+	if (parse_reply(reply, &path, &pns) == FALSE)
 		goto error;
 
 	DBG("fd: %d, path: %s", pns.fd, path);
-- 
1.7.1

Re: [PATCH_v2] connman: Fix crash while requesting and releasing private network

[Denis Kenzior]

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

Hi Guillaume,

On 07/29/2011 07:49 AM, Guillaume Zajac wrote:
> This v2 fixes indentation issue.
> 

Please use the appropriate field for the change log, it does not belong
in the patch description.  I keep having to hand-edit your patches to
remove this stuff.

> ---
>  plugins/connman.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 

I have applied this patch but broke it up into two:
ae4ed8
446ee3

Regards,
-Denis