Lock while installign generator

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Mark Spencer 22 years ago
parent ea70485e7b
commit ea2b6241fd

@ -786,6 +786,8 @@ void ast_deactivate_generator(struct ast_channel *chan)
int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, void *params) int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, void *params)
{ {
int res = 0;
ast_mutex_lock(&chan->lock);
if (chan->generatordata) { if (chan->generatordata) {
if (chan->generator && chan->generator->release) if (chan->generator && chan->generator->release)
chan->generator->release(chan, chan->generatordata); chan->generator->release(chan, chan->generatordata);
@ -795,9 +797,10 @@ int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen,
if ((chan->generatordata = gen->alloc(chan, params))) { if ((chan->generatordata = gen->alloc(chan, params))) {
chan->generator = gen; chan->generator = gen;
} else { } else {
return -1; res = -1;
} }
return 0; ast_mutex_unlock(&chan->lock);
return res;
} }
int ast_waitfor_n_fd(int *fds, int n, int *ms, int *exception) int ast_waitfor_n_fd(int *fds, int n, int *ms, int *exception)

Loading…
Cancel
Save