diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-11-10 23:02:46 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-11-10 23:02:46 +0000 |
| commit | 46089f6b5183df468136fc995419bafd176720cf (patch) | |
| tree | 7907428047f4ebc80991e8cfd03660f3d2dbc4d6 /apps/app_macro.c | |
| parent | 464b337b3cfdbcc75ef7ef81c1c54a1ce950c264 (diff) | |
Fix potential deadlock calling ast_call() with channel locks held.
Fixed app_queue.c:ring_entry() calling ast_call() with the channel locks
held. Chan_local attempts to do deadlock avoidance in its ast_call()
callback and could deadlock if a channel lock is already held.
........
Merged revisions 344539 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 344540 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@344541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_macro.c')
0 files changed, 0 insertions, 0 deletions