mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

basetsmux: Fix language crash when ts_pad->stream is NULL

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4785>
This commit is contained in:
Vivia Nikolaidou 2023-06-06 20:18:53 +03:00 committed by GStreamer Marge Bot
parent e87861ca92
commit 0e62bb2ba6
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c
View file

@ -2104,19 +2104,20 @@ gst_base_ts_mux_sink_event (GstAggregator * agg, GstAggregatorPad * agg_pad,
lang_code = gst_tag_get_language_code_iso_639_2B (lang); lang_code = gst_tag_get_language_code_iso_639_2B (lang);
if (lang_code) { if (lang_code) {
gchar *old_language = g_strdup (ts_pad->language);
GST_DEBUG_OBJECT (ts_pad, "Setting language to '%s'", lang_code);
g_free (ts_pad->language); g_mutex_lock (&mux->lock);
ts_pad->language = g_strdup (lang_code); if (g_strcmp0 (ts_pad->language, lang_code) != 0) {
strncpy (ts_pad->stream->language, lang_code, 3); GST_DEBUG_OBJECT (ts_pad, "Setting language to '%s'", lang_code);
ts_pad->stream->language[3] = 0;
if (g_strcmp0 (old_language, lang_code) != 0) { g_free (ts_pad->language);
g_mutex_lock (&mux->lock); ts_pad->language = g_strdup (lang_code);
gst_base_ts_mux_resend_all_pmts (mux); if (ts_pad->stream) {
g_mutex_unlock (&mux->lock); strncpy (ts_pad->stream->language, lang_code, 3);
ts_pad->stream->language[3] = 0;
gst_base_ts_mux_resend_all_pmts (mux);
}
} }
g_free (old_language); g_mutex_unlock (&mux->lock);
} else { } else {
GST_WARNING_OBJECT (ts_pad, "Did not get language code for '%s'", GST_WARNING_OBJECT (ts_pad, "Did not get language code for '%s'",
lang); lang);