luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-05 18:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

garray: Use g_array_elt_len/pos where appropriate

Browse Source 
The multiplication of two guint values could overflow with large
arrays. Use g_array_elt_len and g_array_elt_pos to avoid explicit
elt_size multiplications.
This commit is contained in:
Tobias Stoeckmann
2025-07-08 20:54:57 +02:00
parent 5da569a425
commit ca1b2028fc
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

@@ -892,7 +892,7 @@ g_array_remove_range (GArray *farray,
if (index_ + length != array->len) if (index_ + length != array->len)
memmove (g_array_elt_pos (array, index_), memmove (g_array_elt_pos (array, index_),
g_array_elt_pos (array, index_ + length), g_array_elt_pos (array, index_ + length),
(array->len - (index_ + length)) * array->elt_size); g_array_elt_len (array, array->len - (index_ + length)));
array->len -= length; array->len -= length;
if (G_UNLIKELY (g_mem_gc_friendly)) if (G_UNLIKELY (g_mem_gc_friendly))
@@ -1026,7 +1026,7 @@ g_array_binary_search (GArray *array,
{ {
middle = left + (right - left) / 2; middle = left + (right - left) / 2;
val = compare_func (_array->data + (_array->elt_size * middle), target); val = compare_func (g_array_elt_pos (_array, middle), target);
if (val == 0) if (val == 0)
{ {
result = TRUE; result = TRUE;
@@ -1590,7 +1590,7 @@ g_array_copy (GArray *array)
rarray->elt_size, rarray->elt_capacity); rarray->elt_size, rarray->elt_capacity);
new_rarray->len = rarray->len; new_rarray->len = rarray->len;
if (rarray->len > 0) if (rarray->len > 0)
memcpy (new_rarray->data, rarray->data, rarray->len * rarray->elt_size); memcpy (new_rarray->data, rarray->data, g_array_elt_len (rarray, rarray->len));
g_array_zero_terminate (new_rarray); g_array_zero_terminate (new_rarray);