From 28c0cb28d0815e5e59ab99b60ac6b50e1ed9cbae Mon Sep 17 00:00:00 2001 From: Kevin Harwell Date: Wed, 18 Dec 2013 20:33:37 +0000 Subject: channel locking: Add locking for channel snapshot creation Original commit message by mmichelson (asterisk 12 r403311): "This adds channel locks around calls to create channel snapshots as well as other functions which operate on a channel and then end up creating a channel snapshot. Functions that expect the channel to be locked prior to being called have had their documentation updated to indicate such." The above was initially committed and then reverted at r403398. The problem was found to be in core_local.c in the publish_local_bridge_message function. The ast_unreal_lock_all function locks and adds a reference to the returned channels and while they were being unlocked they were not being unreffed when no longer needed. Fixed by unreffing the channels. Also in bridge.c a lock was obtained on "other->chan", but then an attempt was made to unlock "other" and not the previously locked channel. Fixed by unlocking "other->chan" (closes issue ASTERISK-22709) Reported by: John Bigelow ........ Merged revisions 404237 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404260 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index feea3b6c5..4621d15b4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1384,7 +1384,9 @@ static void meetme_stasis_generate_msg(struct ast_conference *meetme_conference, } } + ast_channel_lock(chan); msg = ast_channel_blob_create(chan, message_type, json_object); + ast_channel_unlock(chan); if (!msg) { return; -- cgit v1.2.3