colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iterator: skip NULL pointers when iterating pointer arrays

Browse Source
This commit is contained in:
Julian Bouzas
2022-06-16 15:26:01 -04:00
committed by George Kiagiadakis
parent 2536380a81
commit c86410e708
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/wp/iterator.c
View File

@@ -235,8 +235,10 @@ ptr_array_iterator_next (WpIterator *it, GValue *item)
{ {
struct ptr_array_iterator_data *it_data = wp_iterator_get_user_data (it); struct ptr_array_iterator_data *it_data = wp_iterator_get_user_data (it);
if (it_data->index < it_data->array->len) { while (it_data->index < it_data->array->len) {
gpointer ptr = g_ptr_array_index (it_data->array, it_data->index++); gpointer ptr = g_ptr_array_index (it_data->array, it_data->index++);
if (!ptr)
continue;
g_value_init (item, it_data->item_type); g_value_init (item, it_data->item_type);
it_data->set_value (item, ptr); it_data->set_value (item, ptr);
return TRUE; return TRUE;
@@ -256,11 +258,13 @@ ptr_array_iterator_fold (WpIterator *it, WpIteratorFoldFunc func, GValue *ret,
len = it_data->array->len; len = it_data->array->len;
while ((ptr - base) < len) { while ((ptr - base) < len) {
g_auto (GValue) item = G_VALUE_INIT; if (*ptr) {
g_value_init (&item, it_data->item_type); g_auto (GValue) item = G_VALUE_INIT;
it_data->set_value (&item, *ptr); g_value_init (&item, it_data->item_type);
if (!func (&item, ret, data)) it_data->set_value (&item, *ptr);
return FALSE; if (!func (&item, ret, data))
return FALSE;
}
ptr++; ptr++;
} }
return TRUE; return TRUE;