luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 16:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gptrarray: Set free func on copied array in g_ptr_array_copy()

Browse Source 
Otherwise its elements (which have just all been copied) will leak.

Spotted by Xavier Claessens in
https://gitlab.gnome.org/GNOME/glib/merge_requests/918#note_555867.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2019-07-16 10:15:09 +01:00
parent d076c4c688
commit 1ac8d50331
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/garray.c
View File

@ -1020,6 +1020,9 @@ g_ptr_array_new (void)
* If @func is %NULL, then only the pointers (and not what they are * If @func is %NULL, then only the pointers (and not what they are
* pointing to) are copied to the new #GPtrArray. * pointing to) are copied to the new #GPtrArray.
* *
* The copy of @array will have the same #GDestroyNotify for its elements as
* @array.
*
* Returns: (transfer full): a deep copy of the initial #GPtrArray. * Returns: (transfer full): a deep copy of the initial #GPtrArray.
* *
* Since: 2.62 * Since: 2.62
@ -1035,6 +1038,8 @@ g_ptr_array_copy (GPtrArray *array,
g_return_val_if_fail (array != NULL, NULL); g_return_val_if_fail (array != NULL, NULL);
new_array = g_ptr_array_sized_new (array->len); new_array = g_ptr_array_sized_new (array->len);
g_ptr_array_set_free_func (new_array, ((GRealPtrArray *) array)->element_free_func);
if (func != NULL) if (func != NULL)
{ {
for (i = 0; i < array->len; i++) for (i = 0; i < array->len; i++)