From d16c8c0af763b9c5df4dc1b37589966f5b21f737 Mon Sep 17 00:00:00 2001 From: russell Date: Mon, 10 Mar 2008 16:58:57 +0000 Subject: Fix a race condition where the generator can go away (closes issue #12175, reported by edantie, patched by me) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@107099 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main/channel.c b/main/channel.c index 2cb3b7be3..d148cd97d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1560,9 +1560,13 @@ static int generator_force(const void *data) 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); chan->generatordata = tmp; -- cgit v1.2.3