From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 24 Jun 2010 22:19:36 +0000 (+0000)
Subject: Merged revisions 272447 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=484633b643f465198bbf367a10019dc28acd9497;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index d642fac126..f788ed8d25 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);