2005-04-28 Robert McQueen <robot101@debian.org>

	* glib/dbus-gvalue.c: Patch from Jakub Stachowski to fix a leak in
	generating struct signatures. Fixes bug #6083.

diff --git a/ChangeLog b/ChangeLog
index 0351e87d1cbfbd3b0624424a1b746901554c5360..fdb65cf1e5f9fa774baa91130477fdd1a00fab6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-28  Robert McQueen  <robot101@debian.org>
+
+       * glib/dbus-gvalue.c: Patch from Jakub Stachowski to fix a leak in
+       generating struct signatures. Fixes bug #6083.
+
 2005-04-28  Robert McQueen  <robot101@debian.org>
 
        * qt/Makefile.am: Tweak CLEANFILES from qdbusconnection.moc

diff --git a/glib/dbus-gvalue.c b/glib/dbus-gvalue.c
index e06a8feeac5814d234ff45af93763c4a1dc8d1a2..b81b4a6557132c13a6b6aae632793e83e9ad79bb 100644 (file)
--- a/glib/dbus-gvalue.c
+++ b/glib/dbus-gvalue.c
@@ -392,10 +392,13 @@ _dbus_gtype_to_signature (GType gtype)
       size = dbus_g_type_get_struct_size (gtype);
       sig = g_string_sized_new (size+2); /*some sensible starting size*/
       g_string_assign (sig, DBUS_STRUCT_BEGIN_CHAR_AS_STRING);
-      for (i=0; i < size; i++)
+      for (i = 0; i < size; i++)
         {
-          g_string_append (sig, _dbus_gtype_to_signature (
-              dbus_g_type_get_struct_member_type (gtype, i)));
+          gchar *subsig;
+          subsig = _dbus_gtype_to_signature (
+              dbus_g_type_get_struct_member_type (gtype, i));
+          g_string_append (sig, subsig);
+          g_free (subsig);
         }
       g_string_append (sig, DBUS_STRUCT_END_CHAR_AS_STRING);
       ret = g_string_free (sig, FALSE);