FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uridecodebin3: Add missing locking and NULL checks when adding URIs to messages

Browse Source 
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4559

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9500>
This commit is contained in:
Sebastian Dröge 2025-08-06 15:27:32 +03:00 committed by GStreamer Marge Bot
parent 24356c099a
commit 8ea031b400
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
View File

@ -2175,17 +2175,19 @@ static GstMessage *
update_message_with_uri (GstURIDecodeBin3 * uridecodebin, GstMessage * msg)
{
gchar *uri = NULL;
gboolean unlock_after = FALSE;
PLAY_ITEMS_LOCK (uridecodebin);
if (gst_object_has_as_ancestor (GST_MESSAGE_SRC (msg),
(GstObject *) uridecodebin->decodebin)) {
uri = uridecodebin->output_item->main_item->uri;
if (uridecodebin->output_item->main_item)
uri = uridecodebin->output_item->main_item->uri;
} else {
GstSourceHandler *handler;
PLAY_ITEMS_LOCK (uridecodebin);
unlock_after = TRUE;
/* Find the matching handler (if any) */
if ((handler = find_source_handler_for_element (uridecodebin, msg->src))) {
uri = handler->play_item->main_item->uri;
if (handler->play_item->main_item)
uri = handler->play_item->main_item->uri;
}
}
@ -2196,8 +2198,7 @@ update_message_with_uri (GstURIDecodeBin3 * uridecodebin, GstMessage * msg)
gst_structure_set (details, "uri", G_TYPE_STRING, uri, NULL);
}
if (unlock_after)
PLAY_ITEMS_UNLOCK (uridecodebin);
PLAY_ITEMS_UNLOCK (uridecodebin);
return msg;
}