aboutsummaryrefslogtreecommitdiffstats
path: root/res/res_musiconhold.c
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-18 23:59:41 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-18 23:59:41 +0000
commit516df7b8c18fd2be00a8cb47e80b9f74c301ab70 (patch)
tree3767df8efb3873764d445f0e7aa30c485dc8d3f6 /res/res_musiconhold.c
parentf402cd625c13280ebd470911d2eb2cab7411a873 (diff)
Merged revisions 157592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r157592 | mmichelson | 2008-11-18 17:59:02 -0600 (Tue, 18 Nov 2008) | 10 lines This change prevents a crash from occurring if res_musiconhold.so is unloaded and then Asterisk is stopped. The problem was that we are not unregistering the ast_moh_destroy function at exit. (closes issue #13761) Reported by: eliel Patches: res_musiconhold.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@157596 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_musiconhold.c')
-rw-r--r--res/res_musiconhold.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 2e89cf8a0..0683ab9a2 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1661,6 +1661,7 @@ static int unload_module(void)
res |= ast_unregister_application(start_moh);
res |= ast_unregister_application(stop_moh);
ast_cli_unregister_multiple(cli_moh, sizeof(cli_moh) / sizeof(struct ast_cli_entry));
+ ast_unregister_atexit(ast_moh_destroy);
return res;
}