summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--glib/dbus-gvalue.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 33a58cf2..d9e8cbc5 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 7f4e822f..e332e71a 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);