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.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@174151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-02-07 16:17:20 +00:00
parent 24e312a999
commit 40864afe1d

View File

@@ -569,9 +569,9 @@ static u_char *ast_var_channel_types_table(struct variable *vp, oid *name, size_
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: