From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Mon, 27 Mar 2023 08:12:49 +0000 (+0900)
Subject: mpegtsbase: remember stream pid before remove stream
X-Git-Tag: accepted/tizen/unified/20230605.170352~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3883ded5aba23ef1c0f40d3aa2f8f04271945cec;hp=0f096021f0d134a2cfebe0ed9b12e13df904ab95;p=platform%2Fupstream%2Fgstreamer.git

mpegtsbase: remember stream pid before remove stream

when do MPEGTS_BIT_UNSET, stream->pid is used but stream is already freed

[Version] 1.22.0-26
[Issue Type] Bug fix

Change-Id: Iebc891e86a975280abe67f24ee5d0f5b66e3c05c
---

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index 522e174..5454415 100644
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -62,7 +62,7 @@
 
 Name:           %{_name}
 Version:        1.22.0
-Release:        25
+Release:        26
 Summary:        Streaming-Media Framework Runtime
 License:        LGPL-2.0+
 Group:          Multimedia/Framework
diff --git a/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c b/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
index 1b5bf7f..b66d10e 100644
--- a/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
+++ b/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
@@ -777,10 +777,10 @@ mpegts_base_update_program (MpegTSBase * base, MpegTSBaseProgram * program,
   }
   for (tmp = toremove; tmp; tmp = tmp->next) {
     MpegTSBaseStream *stream = (MpegTSBaseStream *) tmp->data;
-    mpegts_base_program_remove_stream (base, program, stream->pid);
 #ifdef TIZEN_FEATURE_TSDEMUX_UPDATE_STREAM
     MPEGTS_BIT_UNSET (base->is_pes, stream->pid);
 #endif
+    mpegts_base_program_remove_stream (base, program, stream->pid);
   }
   g_list_free (toremove);
   return TRUE;