diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-12-24 16:59:42 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-12-24 16:59:42 +0000 |
| commit | 3a73c6c90e8a9e1e42cc530569273a59febab86d (patch) | |
| tree | ed3160356d17797b08ff3d17309b6c53de15f77f /main/pbx.c | |
| parent | 7ea4156a5e3540465fd028514cb52fde290f33d2 (diff) | |
main/pbx.c: Fix double lock of contexts lock introduced by r429967
We only need to hold the context_merge_lock once. Locking it twice will make
many other parts of Asterisk very sad.
ASTERISK-24641 #close
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c index 267717e48..77590963f 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -11858,8 +11858,6 @@ static void presence_state_cb(void *unused, struct stasis_subscription *sub, str return; } - ast_mutex_lock(&context_merge_lock);/* Hold off ast_merge_contexts_and_delete */ - cmpdevice = ast_alloca(sizeof(*cmpdevice) + strlen(presence_state->provider)); strcpy(cmpdevice->hintdevice, presence_state->provider); |