kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 10:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 107100 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r107100 | russell | 2008-03-10 11:59:13 -0500 (Mon, 10 Mar 2008) | 11 lines

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

........
r107099 | russell | 2008-03-10 11:58:57 -0500 (Mon, 10 Mar 2008) | 3 lines

Fix a race condition where the generator can go away
(closes issue #12175, reported by edantie, patched by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107101 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-10 16:59:33 +00:00
parent 1036d0869d
commit 8d28aa58f6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/channel.c
View File

@@ -1711,9 +1711,13 @@ static int generator_force(const void *data)
ast_channel_lock(chan); ast_channel_lock(chan);
tmp = chan->generatordata; tmp = chan->generatordata;
chan->generatordata = NULL; chan->generatordata = NULL;
generate = chan->generator->generate; if (chan->generator)
generate = chan->generator->generate;
ast_channel_unlock(chan); ast_channel_unlock(chan);
if (!tmp || !generate)
return 0;
res = generate(chan, tmp, 0, 160); res = generate(chan, tmp, 0, 160);
chan->generatordata = tmp; chan->generatordata = tmp;