diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-06-24 22:11:26 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-06-24 22:11:26 +0000 |
| commit | 30888f913d3b734f3d16b3cb7507b9e6f69be86c (patch) | |
| tree | 4ae0cbbcb720a155fb612b908797e946ba5ece37 | |
| parent | 450f4ff2ee5e525da31fc14e909dbcc492ac2ea5 (diff) | |
Merged revisions 272446 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r272446 | rmudgett | 2010-06-24 16:58:49 -0500 (Thu, 24 Jun 2010) | 10 lines
ss_thread calls pri_grab without lock during overlap dial
Recent changes to chan_dahdi with relation to overlap dialing call
pri_grab without first obtaining a lock.
(closes issue #17414)
Reported by: pdf
Patches:
bug17414.patch uploaded by jpeeler (license 325)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272447 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/sig_pri.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 2a0c8eff5..e7b059fa7 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -1510,6 +1510,7 @@ static void *pri_ss_thread(void *data) ast_copy_string(chan->exten, exten, sizeof(chan->exten)); sig_pri_dsp_reset_and_flush_digits(p); if (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) { + sig_pri_lock_private(p); if (p->pri->pri) { if (!pri_grab(p, p->pri)) { pri_proceeding(p->pri->pri, p->call, PVT_TO_CHANNEL(p), 0); @@ -1519,6 +1520,7 @@ static void *pri_ss_thread(void *data) ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->pri->span); } } + sig_pri_unlock_private(p); } sig_pri_set_echocanceller(p, 1); |