[asterisk-commits] russell: branch 1.6.0 r107101 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Mar 10 11:59:33 2008
New Revision: 107101

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107101
Log:
Merged revisions 107100 via svnmerge from 
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)

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

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

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=107101&r1=107100&r2=107101
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Mon Mar 10 11:59:33 2008
@@ -1711,8 +1711,12 @@
 	ast_channel_lock(chan);
 	tmp = chan->generatordata;
 	chan->generatordata = NULL;
-	generate = chan->generator->generate;
+	if (chan->generator)
+		generate = chan->generator->generate;
 	ast_channel_unlock(chan);
+
+	if (!tmp || !generate)
+		return 0;
 
 	res = generate(chan, tmp, 0, 160);