kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

When deleting a task from the scheduler, ignoring the return value could

Browse Source 
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/branches/1.4@100465 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-01-27 21:59:53 +00:00
parent 53859e0bfc
commit 7060a6888d
11 changed files with 151 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/cdr.c
View File

@@ -1146,8 +1146,7 @@ static int submit_scheduled_batch(const void *data)
static void submit_unscheduled_batch(void)
{
/* this is okay since we are not being called from within the scheduler */
if (cdr_sched > -1)
ast_sched_del(sched, cdr_sched);
AST_SCHED_DEL(sched, cdr_sched);
/* schedule the submission to occur ASAP (1 ms) */
cdr_sched = ast_sched_add(sched, 1, submit_scheduled_batch, NULL);
/* signal the do_cdr thread to wakeup early and do some work (that lazy thread ;) */
@@ -1328,8 +1327,7 @@ static int do_reload(void)
batchmode = 0;
/* don't run the next scheduled CDR posting while reloading */
if (cdr_sched > -1)
ast_sched_del(sched, cdr_sched);
AST_SCHED_DEL(sched, cdr_sched);
if ((config = ast_config_load("cdr.conf"))) {
if ((enabled_value = ast_variable_retrieve(config, "general", "enable"))) {
@@ -1382,7 +1380,7 @@ static int do_reload(void)
ast_cond_init(&cdr_pending_cond, NULL);
if (ast_pthread_create_background(&cdr_thread, NULL, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
AST_SCHED_DEL(sched, cdr_sched);
} else {
ast_cli_register(&cli_submit);
ast_register_atexit(ast_cdr_engine_term);