diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-24 22:19:36 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-24 22:19:36 +0000 |
| commit | af204cb6e6ccd0702d6da0ab960f3222d9590091 (patch) | |
| tree | c1ba7c8c2e26818ae1b5c43b8fe50ef4819eb9c8 /channels | |
| parent | 633604d98b15362e859b001618b62c63a34f6c56 (diff) | |
Merged revisions 272447 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r272447 | rmudgett | 2010-06-24 17:11:26 -0500 (Thu, 24 Jun 2010) | 17 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@272459 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d642fac12..f788ed8d2 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -7839,6 +7839,7 @@ static void *ss_thread(void *data) ast_dsp_digitreset(p->dsp); } if (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) { + ast_mutex_lock(&p->lock); if (p->pri->pri) { if (!pri_grab(p, p->pri)) { pri_proceeding(p->pri->pri, p->call, PVT_TO_CHANNEL(p), 0); @@ -7848,6 +7849,7 @@ static void *ss_thread(void *data) ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span); } } + ast_mutex_unlock(&p->lock); } dahdi_enable_ec(p); ast_setstate(chan, AST_STATE_RING); |