[asterisk-commits] mmichelson: branch 1.6.1 r141369 - in /branches/1.6.1: ./ channels/chan_agent.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Sep  5 16:13:35 2008
New Revision: 141369

URL: http://svn.digium.com/view/asterisk?view=rev&rev=141369
Log:
Merged revisions 141367 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r141367 | mmichelson | 2008-09-05 16:12:09 -0500 (Fri, 05 Sep 2008) | 15 lines

Merged revisions 141366 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141366 | mmichelson | 2008-09-05 16:10:32 -0500 (Fri, 05 Sep 2008) | 7 lines

Agent's should not try to call a channel's indicate callback
if the channel has been hung up. It will likely crash
otherwise

ABE-1159


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_agent.c

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

Modified: branches/1.6.1/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_agent.c?view=diff&rev=141369&r1=141368&r2=141369
==============================================================================
--- branches/1.6.1/channels/chan_agent.c (original)
+++ branches/1.6.1/channels/chan_agent.c Fri Sep  5 16:13:35 2008
@@ -655,7 +655,7 @@
 	struct agent_pvt *p = ast->tech_pvt;
 	int res = -1;
 	ast_mutex_lock(&p->lock);
-	if (p->chan)
+	if (p->chan && !ast_check_hangup(p->chan))
 		res = p->chan->tech->indicate ? p->chan->tech->indicate(p->chan, condition, data, datalen) : -1;
 	else
 		res = 0;