luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 16:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

array: return_if_fail() if element size is 0

Browse Source 
This is particular useful for:
  g_array_new (sizeof (MyStruct), FALSE, FALSE);
because the correct incantation is
  g_array_new (FALSE, FALSE, sizeof (MyStruct));
and these warnings will trigger in the first situation.
This commit is contained in:
Benjamin Otte 2012-01-14 01:13:42 +01:00
parent 9d52243790
commit a6e149e41f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/garray.c
View File

@ -162,7 +162,9 @@ g_array_new (gboolean zero_terminated,
gboolean clear, gboolean clear,
guint elt_size) guint elt_size)
{ {
return (GArray*) g_array_sized_new (zero_terminated, clear, elt_size, 0); g_return_val_if_fail (elt_size > 0, NULL);
return g_array_sized_new (zero_terminated, clear, elt_size, 0);
} }
/** /**
@ -185,7 +187,11 @@ GArray* g_array_sized_new (gboolean zero_terminated,
guint elt_size, guint elt_size,
guint reserved_size) guint reserved_size)
{ {
GRealArray *array = g_slice_new (GRealArray); GRealArray *array;
g_return_val_if_fail (elt_size > 0, NULL);
array = g_slice_new (GRealArray);
array->data = NULL; array->data = NULL;
array->len = 0; array->len = 0;