From 7a0e401133b1401744862e3cecfe330317cf2ed9 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Tue, 28 Jun 2011 19:01:57 +0200 Subject: [PATCH] inputselector: avoid iterating over a single NULL pad --- plugins/elements/gstinputselector.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index c1d257bfa9..7235a470f4 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/gstinputselector.c @@ -334,7 +334,7 @@ gst_selector_pad_iterate_linked_pads (GstPad * pad) { GstInputSelector *sel; GstPad *otherpad; - GstIterator *it; + GstIterator *it = NULL; GValue val = { 0, }; sel = GST_INPUT_SELECTOR (gst_pad_get_parent (pad)); @@ -342,13 +342,13 @@ gst_selector_pad_iterate_linked_pads (GstPad * pad) return NULL; otherpad = gst_input_selector_get_linked_pad (sel, pad, TRUE); - g_value_init (&val, GST_TYPE_PAD); - g_value_set_object (&val, otherpad); - it = gst_iterator_new_single (GST_TYPE_PAD, &val); - g_value_unset (&val); - - if (otherpad) + if (otherpad) { + g_value_init (&val, GST_TYPE_PAD); + g_value_set_object (&val, otherpad); + it = gst_iterator_new_single (GST_TYPE_PAD, &val); + g_value_unset (&val); gst_object_unref (otherpad); + } gst_object_unref (sel); return it;