1
0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-25 11:27:53 +02:00

Merge branch 'coverity-fixes2' into 'main'

garray: Add some additional length assertions

See merge request 
This commit is contained in:
Marco Trevisan
2022-12-30 11:17:39 +00:00

@@ -1371,6 +1371,7 @@ ptr_array_new_from_array (gpointer *data,
GPtrArray *array; GPtrArray *array;
GRealPtrArray *rarray; GRealPtrArray *rarray;
g_assert (data != NULL || len == 0);
g_assert (len <= G_MAXUINT); g_assert (len <= G_MAXUINT);
array = ptr_array_new (len, element_free_func, null_terminated); array = ptr_array_new (len, element_free_func, null_terminated);
@@ -1478,6 +1479,7 @@ g_ptr_array_new_from_null_terminated_array (gpointer *data,
len += 1; len += 1;
} }
g_assert (data != NULL || len == 0);
g_return_val_if_fail (len <= G_MAXUINT, NULL); g_return_val_if_fail (len <= G_MAXUINT, NULL);
return ptr_array_new_from_array ( return ptr_array_new_from_array (