[asterisk-commits] rmudgett: branch 1.6.2 r272459 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jun 24 17:19:36 2010
New Revision: 272459

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272459
Log:
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)
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=272459&r1=272458&r2=272459
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Thu Jun 24 17:19:36 2010
@@ -7839,6 +7839,7 @@
 				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 @@
 						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);