diff options
author | Matthew Jordan <mjordan@digium.com> | 2013-06-25 01:12:58 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2013-06-25 01:12:58 +0000 |
commit | 13b470d704285b596caab33039fdf1b063bbcf9d (patch) | |
tree | 74dae44213d76a78b1ae30da11bb43e92e9f8ead /main/config_options.c | |
parent | 91217ac3c1fd73efe13407a013260ac7cf937b7b (diff) |
Fix memory/ref counting leaks in a variety of locations
This patch fixes the following memory leaks:
* http.c: The structure containing the addresses to bind to was not being
deallocated when no longer used
* named_acl.c: The global configuration information was not disposed of
* config_options.c: An invalid read was occurring for certain option types.
* res_calendar.c: The loaded calendars on module unload were not being
properly disposed of.
* chan_motif.c: The format capabilities needed to be disposed of on module
unload. In addition, this now specifies the default options for the
maxpayloads and maxicecandidates in such a way that it doesn't cause the
invalid read in config_options.c to occur.
(issue ASTERISK-21906)
Reported by: John Hardin
patches:
http.patch uploaded by jhardin (license 6512)
named_acl.patch uploaded by jhardin (license 6512)
config_options.patch uploaded by jhardin (license 6512)
res_calendar.patch uploaded by jhardin (license 6512)
chan_motif.patch uploaded by jhardin (license 6512)
........
Merged revisions 392810 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config_options.c')
-rw-r--r-- | main/config_options.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/main/config_options.c b/main/config_options.c index 3c2a41204..d9f1fd4d3 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -186,14 +186,15 @@ static int link_option_to_types(struct aco_info *info, struct aco_type **types, || xmldoc_update_config_option(types, info->module, opt->name, type->name, opt->default_val, opt->match_type == ACO_REGEX, opt->type) #endif /* AST_XML_DOCS */ ) { - while (--idx) { + do { ao2_unlink(types[idx]->internal->opts, opt); - } + } while (--idx); return -1; } - /* The container should hold the only ref to opt */ - ao2_ref(opt, -1); } + /* The container(s) should hold the only ref to opt */ + ao2_ref(opt, -1); + return 0; } |