summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2015-08-18 16:01:28 +0300
committerSebastian Dröge <sebastian@centricular.com>2015-08-18 16:01:28 +0300
commit6cda5d34946848533b9ef43acd0b35167de98941 (patch)
treeb4fccc91770b03b2daa627885c16e290089c1a54
parent2de91c32e416b9547561d331e167189cd87bb3bd (diff)
audiodecoder: If there are no tags, don't try to do event handling on a NULL event
Fixes some crashes.
-rw-r--r--gst-libs/gst/audio/gstaudiodecoder.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index d6a5e63f3..f4c663afa 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -2343,6 +2343,12 @@ gst_audio_decoder_sink_eventfunc (GstAudioDecoder * dec, GstEvent * event)
event = gst_audio_decoder_create_merged_tags_event (dec);
dec->priv->taglist_changed = FALSE;
GST_AUDIO_DECODER_STREAM_UNLOCK (dec);
+
+ /* No tags, go out of here instead of fall through */
+ if (!event) {
+ ret = TRUE;
+ break;
+ }
}
/* fall through */