Prevent crash on shutdown due to refcount error on queues container.
When app_queue is unloaded, the queues container has its refcount decremented, potentially to 0. Then the taskprocessor responsible for handling device state changes is unreferenced. If the taskprocessor happens to be just about to run its task, then it will create and destroy an iterator on the queues container. This can cause the refcount on the queues container to increase to 1 and then back to 0. Going back to 0 a second time results in double frees. This failure was seen periodically in the testsuite when Asterisk would shut down. ........ Merged revisions 372089 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 372090 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 372091 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
c3b5ec70ac
commit
1ab2639cf2
1 changed files with 1 additions and 1 deletions
|
@ -9484,8 +9484,8 @@ static int unload_module(void)
|
||||||
queue_t_unref(q, "Done with iterator");
|
queue_t_unref(q, "Done with iterator");
|
||||||
}
|
}
|
||||||
ao2_iterator_destroy(&q_iter);
|
ao2_iterator_destroy(&q_iter);
|
||||||
ao2_ref(queues, -1);
|
|
||||||
devicestate_tps = ast_taskprocessor_unreference(devicestate_tps);
|
devicestate_tps = ast_taskprocessor_unreference(devicestate_tps);
|
||||||
|
ao2_ref(queues, -1);
|
||||||
ast_unload_realtime("queue_members");
|
ast_unload_realtime("queue_members");
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue