diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-01-27 22:35:29 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-01-27 22:35:29 +0000 |
| commit | ac699196f54f4a4659b605c02cfdac6c23d7d971 (patch) | |
| tree | 7b27e35fa085d171969d24fcc34ee5ba0350fead /include/asterisk/sched.h | |
| parent | aa9c40236ca50f5b80f7d0bdf1b649c8ed5be2e6 (diff) | |
Merged revisions 100465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r100465 | tilghman | 2008-01-27 15:59:53 -0600 (Sun, 27 Jan 2008) | 11 lines
When deleting a task from the scheduler, ignoring the return value could
possibly cause memory to be accessed after it is freed, which causes all
sorts of random memory corruption. Instead, if a deletion fails, wait a
bit and try again (noting that another thread could change our taskid
value).
(closes issue #11386)
Reported by: flujan
Patches:
20080124__bug11386.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76, flujan, stuarth`
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/sched.h')
| -rw-r--r-- | include/asterisk/sched.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index f074518c5..dbe066310 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -35,6 +35,16 @@ extern "C" { */ #define SCHED_MAX_CACHE 128 +#define AST_SCHED_DEL(sched, id) \ + do { \ + int _count = 0; \ + while (id > -1 && ast_sched_del(sched, id) && _count++ < 10) \ + usleep(1); \ + if (_count == 10) \ + ast_log(LOG_WARNING, "Unable to cancel schedule ID %d. This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \ + id = -1; \ + } while (0); + struct sched_context; /*! \brief New schedule context |