mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

client: protect sessions with lock

Browse source 
Protect the list of sessions with the lock.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=732226
This commit is contained in:
Wim Taymans 2014-07-01 14:41:14 +02:00
parent fe081e7301
commit 5e2afcefdd
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/rtsp-server/rtsp-client.c
View file

@ -297,14 +297,18 @@ client_watch_session (GstRTSPClient * client, GstRTSPSession * session)
{ {
GstRTSPClientPrivate *priv = client->priv; GstRTSPClientPrivate *priv = client->priv;
/* we already know about this session */ g_mutex_lock (&priv->lock);
if (g_list_find (priv->sessions, session) != NULL) /* check if we already know about this session */
return; if (g_list_find (priv->sessions, session) = NULL) {
GST_INFO ("watching session %p", session);
priv->sessions = g_list_prepend (priv->sessions, g_object_ref (session));
}
g_mutex_unlock (&priv->lock);
GST_INFO ("watching session %p", session); return;
priv->sessions = g_list_prepend (priv->sessions, g_object_ref (session));
} }
/* should be called with lock */
static void static void
client_unwatch_session (GstRTSPClient * client, GstRTSPSession * session, client_unwatch_session (GstRTSPClient * client, GstRTSPSession * session,
GList * link) GList * link)
@ -318,12 +322,12 @@ client_unwatch_session (GstRTSPClient * client, GstRTSPSession * session,
if (link == NULL) if (link == NULL)
return; return;
} }
priv->sessions = g_list_delete_link (priv->sessions, link);
/* unlink all media managed in this session */ /* unlink all media managed in this session */
gst_rtsp_session_filter (session, filter_session_media, client); gst_rtsp_session_filter (session, filter_session_media, client);
/* remove the session */ /* remove the session */
priv->sessions = g_list_delete_link (priv->sessions, link);
g_object_unref (session); g_object_unref (session);
} }
@ -2235,8 +2239,13 @@ static void
client_session_removed (GstRTSPSessionPool * pool, GstRTSPSession * session, client_session_removed (GstRTSPSessionPool * pool, GstRTSPSession * session,
GstRTSPClient * client) GstRTSPClient * client)
{ {
GstRTSPClientPrivate *priv = client->priv;
GST_INFO ("client %p: session %p removed", client, session); GST_INFO ("client %p: session %p removed", client, session);
g_mutex_lock (&priv->lock);
client_unwatch_session (client, session, NULL); client_unwatch_session (client, session, NULL);
g_mutex_unlock (&priv->lock);
} }
/* Returns TRUE if there are no Require headers, otherwise returns FALSE /* Returns TRUE if there are no Require headers, otherwise returns FALSE