diff options
| author | Terry Wilson <twilson@digium.com> | 2012-03-28 19:39:24 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-03-28 19:39:24 +0000 |
| commit | dd9405db057da671c115619c9a5f8082ede2e134 (patch) | |
| tree | 33ad80dfb8a5751b7d76e748621055083315251d /addons/chan_ooh323.c | |
| parent | 01cc64585e8a6cd10690086ae80aad32d9af5cb9 (diff) | |
Fix setting CDR variables in the hangup extension
A previous CDR fix for setting CDR variables during a bridge via
custom dialplan features broke setting CDR variables in the
hangup extension. This patch fixes the issue.
Review: https://reviewboard.asterisk.org/r/1794/
........
Merged revisions 358978 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358989 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons/chan_ooh323.c')
| -rw-r--r-- | addons/chan_ooh323.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 129a916fa..f229e8693 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -2720,6 +2720,7 @@ int reload_config(int reload) ast_copy_string(gIP, v->value, sizeof(gIP)); if (ast_parse_arg(v->value, PARSE_ADDR, &bindaddr)) { ast_log(LOG_WARNING, "Invalid address: %s\n", v->value); + ast_config_destroy(cfg); return 1; } if (ast_sockaddr_is_ipv6(&bindaddr)) { @@ -2773,6 +2774,7 @@ int reload_config(int reload) pNewAlias = ast_calloc(1, sizeof(struct ooAliases)); if (!pNewAlias) { ast_log(LOG_ERROR, "Failed to allocate memory for h323id alias\n"); + ast_config_destroy(cfg); return 1; } if (gAliasList == NULL) { /* first h323id - set as callerid if callerid is not set */ @@ -2787,6 +2789,7 @@ int reload_config(int reload) pNewAlias = ast_calloc(1, sizeof(struct ooAliases)); if (!pNewAlias) { ast_log(LOG_ERROR, "Failed to allocate memory for e164 alias\n"); + ast_config_destroy(cfg); return 1; } pNewAlias->type = T_H225AliasAddress_dialedDigits; @@ -2798,6 +2801,7 @@ int reload_config(int reload) pNewAlias = ast_calloc(1, sizeof(struct ooAliases)); if (!pNewAlias) { ast_log(LOG_ERROR, "Failed to allocate memory for email alias\n"); + ast_config_destroy(cfg); return 1; } pNewAlias->type = T_H225AliasAddress_email_ID; |