luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'coverity-array-fixes' into 'main'

Browse Source 
garray: Add assertions to help static analysis

See merge request GNOME/glib!3097
This commit is contained in:
Marco Trevisan 2022-11-30 15:22:05 +00:00
commit dddfdb8488
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/garray.c
View File

@ -285,7 +285,8 @@ g_array_sized_new (gboolean zero_terminated,
if (array->zero_terminated || reserved_size != 0) if (array->zero_terminated || reserved_size != 0)
{ {
g_array_maybe_expand (array, reserved_size); g_array_maybe_expand (array, reserved_size);
g_array_zero_terminate(array); g_assert (array->data != NULL);
g_array_zero_terminate (array);
} }
return (GArray*) array; return (GArray*) array;
@ -1120,7 +1121,10 @@ ptr_array_new (guint reserved_size,
if (G_LIKELY (reserved_size < G_MAXUINT) && if (G_LIKELY (reserved_size < G_MAXUINT) &&
null_terminated) null_terminated)
reserved_size++; reserved_size++;
g_ptr_array_maybe_expand (array, reserved_size); g_ptr_array_maybe_expand (array, reserved_size);
g_assert (array->pdata != NULL);
if (null_terminated) if (null_terminated)
{ {
/* don't use ptr_array_maybe_null_terminate(). It helps the compiler /* don't use ptr_array_maybe_null_terminate(). It helps the compiler