[asterisk-commits] qwell: branch 1.6.2 r270982 - in /branches/1.6.2: ./ channels/chan_agent.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jun 16 16:11:28 2010
New Revision: 270982

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

................
  r270981 | qwell | 2010-06-16 16:10:48 -0500 (Wed, 16 Jun 2010) | 11 lines
  
  Merged revisions 270980 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r270980 | qwell | 2010-06-16 16:10:09 -0500 (Wed, 16 Jun 2010) | 4 lines
    
    Need to lock the agent chan before access its internal bits.
    
    Pointed out by russellb on asterisk-dev mailing list.
  ........
................

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

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

Modified: branches/1.6.2/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_agent.c?view=diff&rev=270982&r1=270981&r2=270982
==============================================================================
--- branches/1.6.2/channels/chan_agent.c (original)
+++ branches/1.6.2/channels/chan_agent.c Wed Jun 16 16:11:28 2010
@@ -2538,7 +2538,9 @@
 		ast_copy_string(buf, agent->moh, len);
 	else if (!strcasecmp(args.item, "channel")) {
 		if (agent->chan) {
+			ast_channel_lock(agent->chan);
 			ast_copy_string(buf, agent->chan->name, len);
+			ast_channel_unlock(agent->chan);
 			tmp = strrchr(buf, '-');
 			if (tmp)
 				*tmp = '\0';