Merge adcfd7de0e into 5cb74797fe

[core] Lock the bug_rwlock when media_bug is initing
Signed-off-by: hateeyan <hateeyan@gmail.com>
2025-01-17 16:41:26 +00:00 · 2023-08-24 14:42:43 +08:00
1 changed files with 2 additions and 1 deletions
--- a/src/switch_core_media_bug.c
+++ b/src/switch_core_media_bug.c
@ -952,12 +952,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t
 	}


+	switch_thread_rwlock_wrlock(session->bug_rwlock);
 	if (bug->callback) {
 		switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT);
 		if (result == SWITCH_FALSE) {
 			switch_core_media_bug_destroy(&bug);
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error attaching BUG to %s\n",
 							  switch_channel_get_name(session->channel));
+			switch_thread_rwlock_unlock(session->bug_rwlock);
 			return SWITCH_STATUS_GENERR;
 		}
 	}
@ -974,7 +976,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t
 	}

 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel));
-	switch_thread_rwlock_wrlock(session->bug_rwlock);

 	if (!session->bugs) {
 		session->bugs = bug;
Author	SHA1	Message	Date
hatee	07f33c5ffb	Merge `adcfd7de0e` into `5cb74797fe`	2025-01-17 16:41:26 +00:00
hateeyan	adcfd7de0e	[core] Lock the bug_rwlock when media_bug is initing Signed-off-by: hateeyan <hateeyan@gmail.com>	2023-08-24 14:42:43 +08:00