summaryrefslogtreecommitdiff
path: root/utils/ael_main.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2009-06-18 15:27:10 +0000
committerRussell Bryant <russell@russellbryant.com>2009-06-18 15:27:10 +0000
commit730e60e583292b45b175a021fef98a5066f0827f (patch)
treecd03de89f09ce741d1fe07a8ee5b81326ad6ac53 /utils/ael_main.c
parentdce6a54a4a8bd2a36cdc72d6d111df6a252436a0 (diff)
Merged revisions 201600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r201600 | russell | 2009-06-18 10:24:31 -0500 (Thu, 18 Jun 2009) | 29 lines Fix memory corruption and leakage related reloads of non files mode MoH classes. For Music on Hold classes that are not files mode, meaning that we are executing an application that will feed us audio data, we use a thread to monitor the external application and read audio from it. This thread also makes use of the MoH class object. In the MoH class destructor, we used pthread_cancel() to ask the thread to exit. Unfortunately, the code did not wait to ensure that the thread actually went away. What needed to be done is a pthread_join() to ensure that the thread fully cleans up before we proceed. By adding this one line, we resolve two significant problems: 1) Since the thread was never joined, it never fully goes away. So, on every reload of non-files mode MoH, an unused thread was sticking around. 2) There was a race condition here where the application monitoring thread could still try to access the MoH class, even though the thread executing the MoH reload has already destroyed it. (issue #15109) Reported by: jvandal (issue #15123) Reported by: axisinternet (issue #15195) Reported by: amorsen (issue AST-208) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'utils/ael_main.c')
0 files changed, 0 insertions, 0 deletions