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

Merge branch 'backport-1481-ptr-array-corruption-fix' into 'glib-2-64'

Browse Source 
Backport !1481 “array: fix corrupt state of GPtrArray after g_ptr_array_extend_and_steal()” to glib-2-64

See merge request GNOME/glib!1483
This commit is contained in:
Emmanuele Bassi
2020-05-14 14:06:14 +00:00
parent f66e56bc2b ebc518da45
commit b53de16538
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
glib/garray.c
View File

@@ -1870,6 +1870,7 @@ g_ptr_array_extend_and_steal (GPtrArray *array_to_extend,
* to the elements moved from @array to @array_to_extend. */
pdata = g_steal_pointer (&array->pdata);
array->len = 0;
((GRealPtrArray *) array)->alloc = 0;
g_ptr_array_unref (array);
g_free (pdata);
}

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

@@ -1298,6 +1298,8 @@ pointer_array_extend_and_steal (void)
g_assert_cmpuint (ptr_array3->len, ==, 0);
g_assert_null (ptr_array3->pdata);
g_ptr_array_add (ptr_array2, NULL);
g_ptr_array_free (ptr_array, TRUE);
g_ptr_array_free (ptr_array3, TRUE);