summaryrefslogtreecommitdiffstats
path: root/ext/gconf/gstgconfaudiosrc.c
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-05-03 09:18:22 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-05-03 09:18:22 +0000
commit24e21ae6e9d0cc81b5fb93668848437e6a851df9 (patch)
tree755e37a240fb7294865ff7638dc2c6b08b78f6af /ext/gconf/gstgconfaudiosrc.c
parent34f916abbd9284552603810e3a0d4abf3e831dbd (diff)
ext/gconf/: When we can't create a fakesink/fakesrc complain instead of unreffing
Original commit message from CVS: * ext/gconf/gstgconfaudiosrc.c: (gst_gconf_audio_src_reset), (gst_gconf_audio_src_change_state): * ext/gconf/gstgconfvideosink.c: (gst_gconf_video_sink_reset), (gst_gconf_video_sink_change_state): * ext/gconf/gstgconfvideosrc.c: (gst_gconf_video_src_reset), (gst_gconf_video_src_change_state): * ext/gconf/gstswitchsink.c: (gst_switch_sink_reset), (gst_switch_commit_new_kid), (gst_switch_sink_change_state): When we can't create a fakesink/fakesrc complain instead of unreffing NULL pointers and crashing later. See bug #530535.
Diffstat (limited to 'ext/gconf/gstgconfaudiosrc.c')
-rw-r--r--ext/gconf/gstgconfaudiosrc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/gconf/gstgconfaudiosrc.c b/ext/gconf/gstgconfaudiosrc.c
index b9379c4c..589cf6af 100644
--- a/ext/gconf/gstgconfaudiosrc.c
+++ b/ext/gconf/gstgconfaudiosrc.c
@@ -71,7 +71,7 @@ gst_gconf_audio_src_class_init (GstGConfAudioSrcClass * klass)
* Hack to make negotiation work.
*/
-static void
+static gboolean
gst_gconf_audio_src_reset (GstGConfAudioSrc * src)
{
GstPad *targetpad;
@@ -82,6 +82,10 @@ gst_gconf_audio_src_reset (GstGConfAudioSrc * src)
gst_bin_remove (GST_BIN (src), src->kid);
}
src->kid = gst_element_factory_make ("fakesrc", "testsrc");
+ if (!src->kid) {
+ GST_ERROR_OBJECT (src, "Failed to create fakesrc");
+ return FALSE;
+ }
gst_bin_add (GST_BIN (src), src->kid);
targetpad = gst_element_get_pad (src->kid, "src");
@@ -90,6 +94,7 @@ gst_gconf_audio_src_reset (GstGConfAudioSrc * src)
g_free (src->gconf_str);
src->gconf_str = NULL;
+ return TRUE;
}
static void
@@ -225,7 +230,8 @@ gst_gconf_audio_src_change_state (GstElement * element,
switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL:
- gst_gconf_audio_src_reset (src);
+ if (!gst_gconf_audio_src_reset (src))
+ ret = GST_STATE_CHANGE_FAILURE;
break;
default:
break;