mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-13 23:22:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstiterator: Added error handling to filtered iterators

Browse source 
Otherwise, if the underlying iterator returns GST_ITERATOR_ERROR, the filtered
iterator will crash.

With this change, the filtered iterator propagates the error back to the caller.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8367>
This commit is contained in:
Jordan Yelloz 2025-01-27 07:45:22 -07:00 committed by GStreamer Marge Bot
parent 49e4c0b451
commit 2619a59f82
2 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
subprojects/gstreamer/gst/gstiterator.c
View file

@ -486,6 +486,7 @@ filter_next (GstIteratorFilter * it, GValue * elem)
break;
case GST_ITERATOR_RESYNC:
case GST_ITERATOR_DONE:
case GST_ITERATOR_ERROR:
done = TRUE;
break;
default:

58
subprojects/gstreamer/tests/check/gst/gstiterator.c
View file

@ -37,6 +37,41 @@ make_list_of_ints (gint n)
return g_list_reverse (ret);
}
static GstIteratorResult
broken_iterator_next (G_GNUC_UNUSED GstIterator * it,
G_GNUC_UNUSED GValue * val)
{
return GST_ITERATOR_ERROR;
}
static void
broken_iterator_resync (G_GNUC_UNUSED GstIterator * it)
{
}
static void
broken_iterator_free (G_GNUC_UNUSED GstIterator * it)
{
}
static GstIterator *
make_broken_iterator (GType item_type, GMutex * mutex, guint32 * cookie)
{
return gst_iterator_new (sizeof (GstIterator),
item_type,
mutex,
cookie,
NULL,
broken_iterator_next, NULL, broken_iterator_resync, broken_iterator_free);
}
static gint
passthrough_filter (G_GNUC_UNUSED gconstpointer a,
G_GNUC_UNUSED gconstpointer b)
{
return 0;
}
#define NUM_ELEMENTS 10
GST_START_TEST (test_manual_iteration)
@ -424,6 +459,28 @@ GST_START_TEST (test_filter_of_filter_locking)
GST_END_TEST;
GST_START_TEST (test_filter_propagates_error)
{
guint32 cookie = 0;
GMutex m;
g_mutex_init (&m);
GValue v = G_VALUE_INIT;
g_value_init (&v, G_TYPE_POINTER);
GstIterator *it =
gst_iterator_filter (make_broken_iterator (G_TYPE_POINTER, &mutex,
&cookie), passthrough_filter, NULL);
fail_unless_equals_int (gst_iterator_next (it, &v), GST_ITERATOR_ERROR);
gst_iterator_free (it);
g_mutex_clear (&m);
g_value_unset (&v);
}
GST_END_TEST;
static Suite *
gst_iterator_suite (void)
{
@ -441,6 +498,7 @@ gst_iterator_suite (void)
tcase_add_test (tc_chain, test_filter_locking);
tcase_add_test (tc_chain, test_filter_of_filter);
tcase_add_test (tc_chain, test_filter_of_filter_locking);
tcase_add_test (tc_chain, test_filter_propagates_error);
return s;
}