]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Scheduler: Fix a nasty scheduler caching bug which makes new tasks not execute
authorJonathan Rose <jrose@digium.com>
Tue, 14 Oct 2014 19:12:58 +0000 (19:12 +0000)
committerJonathan Rose <jrose@digium.com>
Tue, 14 Oct 2014 19:12:58 +0000 (19:12 +0000)
Tasks that were marked for pending deletion in the scheduler would be moved to
the cache for later reuse, but after being recycled the deleted mark wouldn't
be removed resulting in fresh tasks being deleted without reason... and
immediately moved back into the cache where they could be reused again. This
could cause horrendous things to happen in just about anything that used a
scheduler.

ASTERISK-24321 #close
Reported by: Steve Pitts
Review: https://reviewboard.asterisk.org/r/4071/
........

Merged revisions 425503 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 425504 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@425505 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/sched.c

index 97e07eab5f450011a73291106e7f1932dab1b581..34f8d5369b03059d9e2133ff8b89a2bb91f4e808 100644 (file)
@@ -374,6 +374,7 @@ int ast_sched_add_variable(struct ast_sched_context *con, int when, ast_sched_cb
                tmp->resched = when;
                tmp->variable = variable;
                tmp->when = ast_tv(0, 0);
+               tmp->deleted = 0;
                if (sched_settime(&tmp->when, when)) {
                        sched_release(con, tmp);
                } else {