diff options
| author | Matthew Jordan <mjordan@digium.com> | 2012-10-02 01:47:16 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2012-10-02 01:47:16 +0000 |
| commit | a094707d5156a005fb6e9277bd4a14f9d7e7ab1c (patch) | |
| tree | 26a15c7ef864995e2f2d89d09294024bad0145cb /channels/chan_agent.c | |
| parent | 4e228fce0382550136e5c34cb4d9fd400b8d4ad3 (diff) | |
Fix a variety of ref counting issues
This patch resolves a number of ref leaks that occur primarily on Asterisk
shutdown. It adds a variety of shutdown routines to core portions of
Asterisk such that they can reclaim resources allocate duringd initialization.
Review: https://reviewboard.asterisk.org/r/2137
........
Merged revisions 374177 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374178 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374196 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_agent.c')
| -rw-r--r-- | channels/chan_agent.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index d09837402..1c68d1187 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -2590,12 +2590,15 @@ static int load_module(void) ast_format_cap_add_all(agent_tech.capabilities); /* Make sure we can register our agent channel type */ if (ast_channel_register(&agent_tech)) { + agent_tech.capabilities = ast_format_cap_destroy(agent_tech.capabilities); ast_log(LOG_ERROR, "Unable to register channel class 'Agent'\n"); return AST_MODULE_LOAD_FAILURE; } /* Read in the config */ - if (!read_agent_config(0)) + if (!read_agent_config(0)) { + agent_tech.capabilities = ast_format_cap_destroy(agent_tech.capabilities); return AST_MODULE_LOAD_DECLINE; + } /* Dialplan applications */ ast_register_application_xml(app, login_exec); ast_register_application_xml(app3, agentmonitoroutgoing_exec); |