From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 20 Jan 2015 18:17:46 +0000 (-0600)
Subject: FS-7513: tweak locking on video read callback
X-Git-Tag: v1.6.2~614^2~484
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2bbd507913109af8a7ffffacebe47fceb080a1c;p=thirdparty%2Ffreeswitch.git

FS-7513: tweak locking on video read callback
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 605481d385..2f965f58c7 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2986,6 +2986,11 @@ switch_status_t video_thread_callback(switch_core_session_t *session, switch_fra
 	switch_assert(member);
 
 	lock_member(member);
+	
+	if (switch_thread_rwlock_tryrdlock(member->conference->rwlock) != SWITCH_STATUS_SUCCESS) {
+		unlock_member(member);
+		return SWITCH_STATUS_FALSE;
+	}
 
 	for (rel = member->relationships; rel; rel = rel->next) {
 		conference_member_t *imember;
@@ -3011,7 +3016,7 @@ switch_status_t video_thread_callback(switch_core_session_t *session, switch_fra
 
 		last = rel;
 	}
-	unlock_member(member);
+
 
 	if (member) {
 		if (member->id == member->conference->video_floor_holder) {
@@ -3026,6 +3031,9 @@ switch_status_t video_thread_callback(switch_core_session_t *session, switch_fra
 		}
 	}
 
+	unlock_member(member);
+	switch_thread_rwlock_unlock(member->conference->rwlock);
+
 	return SWITCH_STATUS_SUCCESS;
 }