[asterisk-commits] russell: branch 1.6.0 r174151 - in /branches/1.6.0: ./ res/snmp/agent.c

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Feb  7 10:17:20 2009
New Revision: 174151

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

................
r174149 | russell | 2009-02-07 10:16:50 -0600 (Sat, 07 Feb 2009) | 10 lines

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

........
r174148 | russell | 2009-02-07 10:15:07 -0600 (Sat, 07 Feb 2009) | 2 lines

Fix a race condition that could cause a crash.

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/snmp/agent.c

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

Modified: branches/1.6.0/res/snmp/agent.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/res/snmp/agent.c?view=diff&rev=174151&r1=174150&r2=174151
==============================================================================
--- branches/1.6.0/res/snmp/agent.c (original)
+++ branches/1.6.0/res/snmp/agent.c Sat Feb  7 10:17:20 2009
@@ -569,9 +569,9 @@
 	case ASTCHANTYPECHANNELS:
 		long_ret = 0;
 		for (chan = ast_channel_walk_locked(NULL); chan; chan = ast_channel_walk_locked(chan)) {
-			ast_channel_unlock(chan);
 			if (chan->tech == tech)
 				long_ret++;
+			ast_channel_unlock(chan);
 		}
 		return (u_char *)&long_ret;
 	default: