Attachment 4981 Details for Bug 6300 – Fix with assert

[patch] Fix with assert

memleak2.patch (text/plain), 3.03 KB, created by Jakub Stachowski on 2006-03-18 04:55:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Stachowski

Created: 2006-03-18 04:55:09 UTC

Size: 3.03 KB

patch

obsolete

>? fix-ptrarray-free-leak.patch
>? memleak-2.patch
>? memleak2.patch
>Index: dbus-gvalue-utils.c
>===================================================================
>RCS file: /cvs/dbus/dbus/glib/dbus-gvalue-utils.c,v
>retrieving revision 1.9
>diff -u -r1.9 dbus-gvalue-utils.c
>--- dbus-gvalue-utils.c	13 Feb 2006 22:30:11 -0000	1.9
>+++ dbus-gvalue-utils.c	17 Mar 2006 17:48:30 -0000
>@@ -772,6 +772,32 @@
>     }
> }
> 
>+static void
>+take_gvalue_from_ptrarray_value (GValue *value, gpointer instance)
>+{
>+  switch (g_type_fundamental (G_VALUE_TYPE (value)))
>+    {
>+    case G_TYPE_STRING:
>+      g_value_take_string (value, instance);
>+      break;
>+    case G_TYPE_POINTER:
>+      g_value_set_pointer (value, instance);
>+      g_assert_not_reached ();
>+      break;
>+    case G_TYPE_BOXED:
>+      g_value_take_boxed (value, instance);
>+      break;
>+    case G_TYPE_OBJECT:
>+      g_value_take_object (value, instance);
>+      g_object_unref (g_value_get_object (value));
>+      break;
>+    default:
>+      g_assert_not_reached ();
>+      break;
>+    }
>+}
>+
>+
> static gpointer
> ptrarray_value_from_gvalue (const GValue *value)
> {
>@@ -796,7 +822,7 @@
> }
> 
> static void
>-ptrarray_iterator (GType                                   hash_type,
>+ptrarray_iterator (GType                                   ptrarray_type,
> 		   gpointer                                instance,
> 		   DBusGTypeSpecializedCollectionIterator  iterator,
> 		   gpointer                                user_data)
>@@ -807,7 +833,7 @@
> 
>   ptrarray = instance;
> 
>-  elt_gtype = dbus_g_type_get_collection_specialization (hash_type);
>+  elt_gtype = dbus_g_type_get_collection_specialization (ptrarray_type);
> 
>   for (i = 0; i < ptrarray->len; i++)
>     {
>@@ -822,8 +848,8 @@
> ptrarray_copy_elt (const GValue *val, gpointer user_data)
> {
>   GPtrArray *dest = user_data;
>-  GValue val_copy = {0, }; 
>-  
>+  GValue val_copy = {0, };
>+
>   g_value_init (&val_copy, G_VALUE_TYPE (val));
>   g_value_copy (val, &val_copy);
> 
>@@ -858,9 +884,22 @@
> static void
> ptrarray_free (GType type, gpointer val)
> {
>-  /* XXX: this function appears to leak the contents of the array */
>   GPtrArray *array;
>+  GValue elt_val = {0, };
>+  GType elt_gtype;
>+  unsigned int i;
>+
>   array = val;
>+
>+  elt_gtype = dbus_g_type_get_collection_specialization (type);
>+
>+  for (i = 0; i < array->len; i++)
>+    {
>+      g_value_init (&elt_val, elt_gtype);
>+      take_gvalue_from_ptrarray_value (&elt_val, g_ptr_array_index (array, i));
>+      g_value_unset (&elt_val);
>+    }
>+
>   g_ptr_array_free (array, TRUE);
> }
> 
>@@ -943,9 +982,21 @@
> static void
> slist_free (GType type, gpointer val)
> {
>-  /* XXX: this function appears to leak the contents of the list */
>   GSList *list;
>+  GType elt_gtype;
>   list = val;
>+
>+  elt_gtype = dbus_g_type_get_collection_specialization (type);
>+
>+  while (list != NULL)
>+    {
>+      GValue elt_val = {0, };
>+      g_value_init (&elt_val, elt_gtype);
>+      take_gvalue_from_ptrarray_value (&elt_val, list->data);
>+      g_value_unset (&elt_val);
>+      list = g_slist_next(list); 
>+    }
>+  list=val;
>   g_slist_free (list);
> }
>

Actions: View | Splinter Review

Attachments on bug 6300: 4978 | 4981

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.