diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-27 22:35:29 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-27 22:35:29 +0000 |
| commit | c83caa1ae0033f53e8e51f98415a48f69fb0b349 (patch) | |
| tree | 7b27e35fa085d171969d24fcc34ee5ba0350fead /main/file.c | |
| parent | 76bbd4b67a62edd656285e38f7e204a000d6b091 (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: http://svn.digium.com/svn/asterisk/trunk@100488 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/main/file.c b/main/file.c index fe51c2df7..daffb766d 100644 --- a/main/file.c +++ b/main/file.c @@ -747,17 +747,13 @@ int ast_closestream(struct ast_filestream *f) if (f->owner) { if (f->fmt->format & AST_FORMAT_AUDIO_MASK) { f->owner->stream = NULL; - if (f->owner->streamid > -1) - ast_sched_del(f->owner->sched, f->owner->streamid); - f->owner->streamid = -1; + AST_SCHED_DEL(f->owner->sched, f->owner->streamid); #ifdef HAVE_ZAPTEL ast_settimeout(f->owner, 0, NULL, NULL); #endif } else { f->owner->vstream = NULL; - if (f->owner->vstreamid > -1) - ast_sched_del(f->owner->sched, f->owner->vstreamid); - f->owner->vstreamid = -1; + AST_SCHED_DEL(f->owner->sched, f->owner->vstreamid); } } /* destroy the translator on exit */ |