luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 22:03:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Call element_free_func when shrinking array with g_ptr_array_set_size

Browse Source
This commit is contained in:
Dan Winship 2009-09-06 13:54:50 -04:00
parent 9a29f087e7
commit bc1dd5cf11
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/garray.c
View File

@ -618,12 +618,8 @@ g_ptr_array_set_size (GPtrArray *farray,
for (i = array->len; i < length; i++) for (i = array->len; i < length; i++)
array->pdata[i] = NULL; array->pdata[i] = NULL;
} }
if (G_UNLIKELY (g_mem_gc_friendly) && length < array->len) else if (length < array->len)
{ g_ptr_array_remove_range (farray, length, array->len - length);
int i;
for (i = length; i < array->len; i++)
array->pdata[i] = NULL;
}
array->len = length; array->len = length;
} }

4
glib/tests/array-test.c
View File

@ -186,9 +186,11 @@ pointer_array_free_func (void)
g_ptr_array_add (gparray, s); g_ptr_array_add (gparray, s);
g_assert (g_ptr_array_remove (gparray, s)); g_assert (g_ptr_array_remove (gparray, s));
g_assert_cmpint (num_free_func_invocations, ==, 2); g_assert_cmpint (num_free_func_invocations, ==, 2);
g_ptr_array_set_size (gparray, 1);
g_assert_cmpint (num_free_func_invocations, ==, 3);
g_ptr_array_ref (gparray); g_ptr_array_ref (gparray);
g_ptr_array_unref (gparray); g_ptr_array_unref (gparray);
g_assert_cmpint (num_free_func_invocations, ==, 2); g_assert_cmpint (num_free_func_invocations, ==, 3);
g_ptr_array_unref (gparray); g_ptr_array_unref (gparray);
g_assert_cmpint (num_free_func_invocations, ==, 4); g_assert_cmpint (num_free_func_invocations, ==, 4);