diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
| commit | 8e8b329e14ad2e4d747c4c4eb33c118305401aee (patch) | |
| tree | 200a9b111d9cf75ab980aedf53ee714b7cc398f2 /main/pickup.c | |
| parent | 8b24b0d20647697c9ee899dea85871465c3032cb (diff) | |
Add channel locking for channel snapshot creation.
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.
........
Merged revisions 403311 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pickup.c')
| -rw-r--r-- | main/pickup.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/pickup.c b/main/pickup.c index 7ae6927fa..a415f1672 100644 --- a/main/pickup.c +++ b/main/pickup.c @@ -354,11 +354,17 @@ int ast_do_pickup(struct ast_channel *chan, struct ast_channel *target) /* setting the HANGUPCAUSE so the ringing channel knows this call was not a missed call */ ast_channel_hangupcause_set(chan, AST_CAUSE_ANSWERED_ELSEWHERE); - if (!(chan_snapshot = ast_channel_snapshot_create(chan))) { + ast_channel_lock(chan); + chan_snapshot = ast_channel_snapshot_create(chan); + ast_channel_unlock(chan); + if (!chan_snapshot) { goto pickup_failed; } - if (!(target_snapshot = ast_channel_snapshot_create(target))) { + ast_channel_lock(target); + target_snapshot = ast_channel_snapshot_create(target); + ast_channel_unlock(target); + if (!target_snapshot) { goto pickup_failed; } |