diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-04-17 16:16:29 +0200 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-08-11 02:30:41 +0100 |
commit | d45d18c735065ef13de3b7d55b1e4799f808e81d (patch) | |
tree | 64c1f2e881669cc22c08c5a5b5e3ba0313e5f7cd /gst/rtpmanager | |
parent | 64046416ccbad20ee4a4627632e4d063dc3efcc8 (diff) |
rtpsession: join the RTCP thread
Avoid a case where a joinable thread would be left unjoined, which leaked the
thread structure.
Fixes #577318.
Diffstat (limited to 'gst/rtpmanager')
-rw-r--r-- | gst/rtpmanager/gstrtpsession.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index e2a6927f..035d82a8 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -967,6 +967,11 @@ start_rtcp_thread (GstRtpSession * rtpsession) GST_RTP_SESSION_LOCK (rtpsession); rtpsession->priv->stop_thread = FALSE; if (rtpsession->priv->thread_stopped) { + /* if the thread stopped, and we still have a handle to the thread, join it + * now. We can safely join with the lock held, the thread will not take it + * anymore. */ + if (rtpsession->priv->thread) + g_thread_join (rtpsession->priv->thread); /* only create a new thread if the old one was stopped. Otherwise we can * just reuse the currently running one. */ rtpsession->priv->thread = |