[svn-commits] irroot: branch irroot/distrotech-customers-trunk r335975 - /team/irroot/distr...

[SVN commits to the Digium repositories]

Author: irroot
Date: Thu Sep 15 02:06:20 2011
New Revision: 335975

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335975
Log:
Proposed fix for ASTERISK-18092 lock p->owner while calling ast_bridged_channel

Modified:
    team/irroot/distrotech-customers-trunk/channels/chan_agent.c

Modified: team/irroot/distrotech-customers-trunk/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_agent.c?view=diff&rev=335975&r1=335974&r2=335975
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_agent.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_agent.c Thu Sep 15 02:06:20 2011
@@ -1507,6 +1507,7 @@
 	char *talkingto = NULL;
 	char *talkingtoChan = NULL;
 	char *status = NULL;
+	struct ast_channel *bridge;
 
 	if (!ast_strlen_zero(id))
 		snprintf(idText, sizeof(idText) ,"ActionID: %s\r\n", id);
@@ -1531,10 +1532,13 @@
 			if (p->owner && p->owner->_bridge) {
 				talkingto = S_COR(p->chan->caller.id.number.valid,
 					p->chan->caller.id.number.str, "n/a");
-				if (ast_bridged_channel(p->owner))
-					talkingtoChan = ast_strdupa(ast_bridged_channel(p->owner)->name);
-				else
+				ast_channel_lock(p->owner);
+				if ((bridge = ast_bridged_channel(p->owner))) {
+					talkingtoChan = ast_strdupa(bridge->name);
+				} else {
 					talkingtoChan = "n/a";
+				}
+				ast_channel_unlock(p->owner);
 				status = "AGENT_ONCALL";
 			} else {
 				talkingto = "n/a";