From 64adb1998db4ddc6b39f33f82a5fdbc370c4e772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 29 Nov 2015 01:02:15 +0000 Subject: [PATCH] hlsdemux: fix crash when decryption key can't be downloaded Happened with http://sslhls.m6tv.cdn.sfr.net/hls-live/livepkgr/_definst_/m6_hls_aes/m6_hls_aes_856.m3u8 if glib-networking was not installed (since key has https uri). --- ext/hls/gsthlsdemux.c | 9 ++++++--- gst-libs/gst/adaptivedemux/gstadaptivedemux.c | 7 ++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c index 0ab1a43b6c..e0562a961f 100644 --- a/ext/hls/gsthlsdemux.c +++ b/ext/hls/gsthlsdemux.c @@ -477,9 +477,12 @@ gst_hls_demux_start_fragment (GstAdaptiveDemux * demux, return TRUE; key_failed: - /* TODO Raise this error to the user */ - GST_WARNING_OBJECT (demux, "Failed to decrypt data"); - return FALSE; + { + GST_ELEMENT_ERROR (demux, STREAM, DEMUX, + ("Couldn't retrieve key for decryption"), (NULL)); + GST_WARNING_OBJECT (demux, "Failed to decrypt data"); + return FALSE; + } } static GstFlowReturn diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c index 87bebf1ca3..3fb539449f 100644 --- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c @@ -1815,7 +1815,10 @@ _src_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) stream->starting_fragment = FALSE; if (klass->start_fragment) { - klass->start_fragment (demux, stream); + if (!klass->start_fragment (demux, stream)) { + ret = GST_FLOW_ERROR; + goto error; + } } GST_BUFFER_PTS (buffer) = stream->fragment.timestamp; @@ -1881,6 +1884,8 @@ _src_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) ret = GST_FLOW_EOS; /* return EOS to make the source stop */ } +error: + GST_MANIFEST_UNLOCK (demux); return ret;