mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-28 14:52:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-session: Don't unref medias twice if it is removed inside gst_rtsp_session_filter() while the mutex is shortly released

Browse source 
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/757

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1004>
This commit is contained in:
Sebastian Dröge 2021-10-01 13:51:37 +03:00 committed by GStreamer Marge Bot
parent a774dfb18f
commit 7aa88364ac
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-session.c
View file

@ -454,19 +454,38 @@ restart:
res = func (sess, media, user_data);
g_mutex_lock (&priv->lock);
} else
} else {
res = GST_RTSP_FILTER_REF;
}
changed = (cookie != priv->medias_cookie);
switch (res) {
case GST_RTSP_FILTER_REMOVE:
if (changed)
priv->medias = g_list_remove (priv->medias, media);
else
if (changed) {
GList *l;
walk = NULL;
for (l = priv->medias; l; l = l->next) {
if (l->data == media) {
walk = l;
break;
}
}
}
/* The media might have been removed from the list while the mutex was
* unlocked above. In that case there's nothing else to do here as the
* only reference to the media owned by this function is in the
* visited hash table and that is released in the end
*/
if (walk) {
priv->medias = g_list_delete_link (priv->medias, walk);
g_object_unref (media);
}
cookie = ++priv->medias_cookie;
g_object_unref (media);
break;
case GST_RTSP_FILTER_REF:
result = g_list_prepend (result, g_object_ref (media));