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

garray: Fix size checks when taking arrays

Browse Source 
The functions g_array_new_take_zero_terminated and
g_ptr_array_new_take_null_terminated must take into account that the
last element will be the terminating element (zero filled or NULL).

Iterating through all elements must not reach G_MAXUINT, because in
that case no space is left for the terminating element.
This commit is contained in:
Tobias Stoeckmann
2025-07-14 17:36:42 +02:00
parent 6e2a31f97a
commit eaffbef760
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glib/garray.c
View File

@@ -255,7 +255,7 @@ g_array_new_take_zero_terminated (gpointer data,
}
}
g_return_val_if_fail (len <= G_MAXUINT, NULL);
g_return_val_if_fail (len < G_MAXUINT, NULL);
array = g_array_new_take (data, len, clear, element_size);
((GRealArray *)array)->zero_terminated = TRUE;
@@ -1274,7 +1274,7 @@ g_ptr_array_new_take_null_terminated (gpointer *data,
len += 1;
}
g_return_val_if_fail (len <= G_MAXUINT, NULL);
g_return_val_if_fail (len < G_MAXUINT, NULL);
array = g_ptr_array_new_take (g_steal_pointer (&data), len, element_free_func);
((GRealPtrArray *)array)->null_terminated = TRUE;
@@ -1294,7 +1294,7 @@ ptr_array_new_from_array (gpointer *data,
GRealPtrArray *rarray;
g_assert (data != NULL || len == 0);
g_assert (len <= G_MAXUINT);
g_assert (len <= G_MAXUINT - (null_terminated ? 1 : 0));
array = ptr_array_new (len, element_free_func, null_terminated);
rarray = (GRealPtrArray *)array;