[asterisk-commits] rmudgett: trunk r272447 - in /trunk: ./ channels/sig_pri.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jun 24 17:11:26 2010
New Revision: 272447

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272447
Log:
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:
    trunk/   (props changed)
    trunk/channels/sig_pri.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=272447&r1=272446&r2=272447
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Thu Jun 24 17:11:26 2010
@@ -1510,6 +1510,7 @@
 		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 @@
 					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);