From: Robert McQueen <robot101@debian.org>
Date: Fri, 27 Jan 2006 15:15:16 +0000 (+0000)
Subject: 2006-01-27  Robert McQueen  <robot101@debian.org>
X-Git-Tag: dbus-0.61~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce13b5dff7208beade01ac06235c263872201c80;p=thirdparty%2Fdbus.git

2006-01-27  Robert McQueen  <robot101@debian.org>

	* glib/dbus-gvalue.c (demarshal_valuearray): Patch from Rob Taylor
	to free a D-Bus allocated string with dbus_free () instead of
	g_free ().
---

diff --git a/ChangeLog b/ChangeLog
index 33a58cf24..d9e8cbc59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-27  Robert McQueen  <robot101@debian.org>
+
+	* glib/dbus-gvalue.c (demarshal_valuearray): Patch from Rob Taylor
+	to free a D-Bus allocated string with dbus_free () instead of
+	g_free ().
+
 2006-01-27  Iain Holmes  <iain@openedhand.com>
 
 	* glib/dbus-gproxy.c (dbus_g_proxy_dispose): Protect the dispose
diff --git a/glib/dbus-gvalue.c b/glib/dbus-gvalue.c
index 7f4e822fc..e332e71a5 100644
--- a/glib/dbus-gvalue.c
+++ b/glib/dbus-gvalue.c
@@ -741,7 +741,7 @@ demarshal_valuearray (DBusGValueMarshalCtx    *context,
       current_sig = dbus_message_iter_get_signature (&subiter);
       elt_type = _dbus_gtype_from_signature (current_sig, TRUE);
 
-      g_free (current_sig);
+      dbus_free (current_sig);
       if (elt_type == G_TYPE_INVALID)
 	{
 	  g_value_array_free (ret);