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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@335978 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index ea835f9e38b5573d3faa6cc7ea3fc3f97a5a7d1d..a78c44706a78c069724a2179c342b41d4dad1abc 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1506,6 +1506,7 @@ static int action_agents(struct mansession *s, const struct message *m)
        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);
@@ -1530,10 +1531,13 @@ static int action_agents(struct mansession *s, const struct message *m)
                        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";