summaryrefslogtreecommitdiff
path: root/agi
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-08-17 18:31:39 +0000
committerTerry Wilson <twilson@digium.com>2011-08-17 18:31:39 +0000
commitc38cb9586377120b2aea5651b4df025cee315b60 (patch)
tree201db06d7b6a06b7b0b44d6c8b4a3b71ea7ad002 /agi
parent265102faf89e95381910eb0b69a47e338f3baf63 (diff)
Merged revisions 332321 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r332321 | twilson | 2011-08-17 13:09:49 -0500 (Wed, 17 Aug 2011) | 17 lines Merged revisions 332320 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r332320 | twilson | 2011-08-17 12:35:27 -0500 (Wed, 17 Aug 2011) | 10 lines Don't read from a disarmed or invalid timerfd Numerous isues have been reported for deadlocks that are caused by a blocking read in res_timing_timerfd on a file descriptor that will never be written to. This patch adds some checks to make sure that the timerfd is both valid and armed before calling read(). Should fix: ASTERISK-18142, ASTERISK-18166, ASTERISK-18197, AST-486, AST-495, AST-507 and possibly others. Review: https://reviewboard.asterisk.org/r/1361/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'agi')
0 files changed, 0 insertions, 0 deletions