From 155aaf947fdf5caf98107858a7376ce889447546 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 18 Oct 2007 18:06:49 +0000 Subject: Merged revisions 86330 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r86330 | russell | 2007-10-18 13:03:10 -0500 (Thu, 18 Oct 2007) | 10 lines The channel needs to stay locked while running timer callbacks, as they access and modify channel data that may change elsewhere. I went through every timer callback in the source tree to make sure that none of them did any additional locking that could introduce deadlocks, and all is well. (closes issue #10765) Reported by: Ivan Patches: ast_1_4_11_svn_patch_channel_rc.diff uploaded by Ivan (license 229) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86331 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'main/channel.c') diff --git a/main/channel.c b/main/channel.c index 9e209714c..063fc8100 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2210,17 +2210,13 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) } else if (blah == ZT_EVENT_TIMER_EXPIRED) { ioctl(chan->timingfd, ZT_TIMERACK, &blah); if (chan->timingfunc) { - /* save a copy of func/data before unlocking the channel */ - int (*func)(const void *) = chan->timingfunc; - void *data = chan->timingdata; - ast_channel_unlock(chan); - func(data); + chan->timingfunc(chan->timingdata); } else { blah = 0; ioctl(chan->timingfd, ZT_TIMERCONFIG, &blah); chan->timingdata = NULL; - ast_channel_unlock(chan); } + ast_channel_unlock(chan); /* cannot 'goto done' because the channel is already unlocked */ return &ast_null_frame; } else -- cgit v1.2.3