diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2017-04-25 17:11:27 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-04-25 17:12:30 +0300 |
| commit | a593e4966ea9d9f527750a161447bae74510079c (patch) | |
| tree | a11bfbba3986cf1dff5e9bf7cfc19bc3e7f6f7f3 | |
| parent | 36b5dc027021c03cc622df9fdca1d3c29d4e2d97 (diff) | |
qtdemux: Don't perform seeks with inconsistent seek values
If gst_segment_do_seek() fails, we shouldn't try seeking on that
resulting segment but just error out. Crashes further down the line
otherwise.
| -rw-r--r-- | gst/isomp4/qtdemux.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 6a5ed276f..b321b9745 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -1628,6 +1628,7 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event) GstSegment seeksegment; guint32 seqnum = 0; GstEvent *flush_event; + gboolean ret; if (event) { GST_DEBUG_OBJECT (qtdemux, "doing seek with event"); @@ -1674,13 +1675,19 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event) if (event) { /* configure the segment with the seek variables */ GST_DEBUG_OBJECT (qtdemux, "configuring seek"); - gst_segment_do_seek (&seeksegment, rate, format, flags, - cur_type, cur, stop_type, stop, &update); + if (!gst_segment_do_seek (&seeksegment, rate, format, flags, + cur_type, cur, stop_type, stop, &update)) { + ret = FALSE; + GST_ERROR_OBJECT (qtdemux, "inconsistent seek values, doing nothing"); + } else { + /* now do the seek */ + ret = gst_qtdemux_perform_seek (qtdemux, &seeksegment, seqnum, flags); + } + } else { + /* now do the seek */ + ret = gst_qtdemux_perform_seek (qtdemux, &seeksegment, seqnum, flags); } - /* now do the seek, this actually never returns FALSE */ - gst_qtdemux_perform_seek (qtdemux, &seeksegment, seqnum, flags); - /* prepare for streaming again */ if (flush) { flush_event = gst_event_new_flush_stop (TRUE); @@ -1708,7 +1715,7 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event) GST_PAD_STREAM_UNLOCK (qtdemux->sinkpad); - return TRUE; + return ret; /* ERRORS */ no_format: |