luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-30 19:06:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'array_check' into 'main'

Browse Source 
garray: Add checks to g_ptr_array_extend_and_steal

See merge request GNOME/glib!4725
This commit is contained in:
Philip Withnall
2025-08-04 10:47:04 +00:00
parent 817952c59c 3c952f0b80
commit ddf647363b
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glib/garray.c
View File

@@ -2316,6 +2316,9 @@ g_ptr_array_extend_and_steal (GPtrArray *array_to_extend,
{ {
gpointer *pdata; gpointer *pdata;
g_return_if_fail (array_to_extend != NULL);
g_return_if_fail (array != NULL);
g_ptr_array_extend (array_to_extend, array, NULL, NULL); g_ptr_array_extend (array_to_extend, array, NULL, NULL);
/* Get rid of @array without triggering the GDestroyNotify attached /* Get rid of @array without triggering the GDestroyNotify attached

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

@@ -2299,6 +2299,23 @@ pointer_array_extend_and_steal (void)
const gsize array_size = 100; const gsize array_size = 100;
guintptr *array_test = g_malloc (array_size * sizeof (guintptr)); guintptr *array_test = g_malloc (array_size * sizeof (guintptr));
if (g_test_undefined ())
{
/* Testing degenerated cases */
ptr_array = g_ptr_array_sized_new (0);
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
"*assertion*!= NULL*");
g_ptr_array_extend_and_steal (NULL, ptr_array);
g_test_assert_expected_messages ();
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
"*assertion*!= NULL*");
g_ptr_array_extend_and_steal (ptr_array, NULL);
g_test_assert_expected_messages ();
g_ptr_array_unref (ptr_array);
}
/* Initializing array_test */ /* Initializing array_test */
for (i = 0; i < array_size; i++) for (i = 0; i < array_size; i++)
array_test[i] = i; array_test[i] = i;