[svn-commits] irroot: branch irroot/distrotech-customers-1.8 r335992 - in /team/irroot/dist...

[SVN commits to the Digium repositories]

Author: irroot
Date: Thu Sep 15 03:33:52 2011
New Revision: 335992

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335992
Log:
Merged revisions 335978 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r335978 | irroot | 2011-09-15 10:15:22 +0200 (Thu, 15 Sep 2011) | 11 lines
  
  lock the channel before calling ast_bridged_channel() to prevent a seg fault.
  
  AMI agents list called on shutdown causes a segfault, introducing proper locking
  will prevent this.
  
  (closes issue ASTERISK-18092)
  
  Reported by: agustina
  Patches: chan_agent.patch (License #5041) patch uploaded by irroot
........

Modified:
    team/irroot/distrotech-customers-1.8/   (props changed)
    team/irroot/distrotech-customers-1.8/channels/chan_agent.c

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 15 03:33:52 2011
@@ -1,1 +1,1 @@
-/branches/1.8:1-335925
+/branches/1.8:1-335990

Modified: team/irroot/distrotech-customers-1.8/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_agent.c?view=diff&rev=335992&r1=335991&r2=335992
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_agent.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_agent.c Thu Sep 15 03:33:52 2011
@@ -1531,13 +1531,13 @@
 			if (p->owner && p->owner->_bridge) {
 				talkingto = S_COR(p->chan->caller.id.number.valid,
 					p->chan->caller.id.number.str, "n/a");
-				ast_lock_channel(p->owner);
+				ast_channel_lock(p->owner);
 				if ((bridge = ast_bridged_channel(p->owner))) {
 					talkingtoChan = ast_strdupa(bridge->name);
 				} else {
 					talkingtoChan = "n/a";
 				}
-				ast_unlock_channel(p->owner);
+				ast_channel_unlock(p->owner);
 				status = "AGENT_ONCALL";
 			} else {
 				talkingto = "n/a";