From: Jan Schmidt <jan@centricular.com>
Date: Thu, 23 Jun 2022 16:57:54 +0000 (+1000)
Subject: hlsdemux2: Fix potential segfault
X-Git-Tag: 1.22.0~1357
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b7622b377f4843ead2cc7012db112e0289aac6e;p=platform%2Fupstream%2Fgstreamer.git

hlsdemux2: Fix potential segfault

Fix a potential segfault if we receive a ISO-FF stream
with moof before moov.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2676>
---

diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/hls/gsthlsdemux-util.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/hls/gsthlsdemux-util.c
index 0f92170..704786a 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/hls/gsthlsdemux-util.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/hls/gsthlsdemux-util.c
@@ -437,6 +437,11 @@ gst_hlsdemux_handle_content_isobmff (GstHLSDemux * demux,
       {
         GstMoofBox *moof;
 
+        if (hls_stream->moov == NULL) {
+          GST_WARNING ("Received moof with moov in iso-ff stream");
+          break;
+        }
+
         gst_byte_reader_get_sub_reader (&br, &sub, box_size - header_size);
 
         moof = gst_isoff_moof_box_parse (&sub);