diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-12 16:41:49 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-12 16:41:49 +0000 |
| commit | 453e484c25fe19aa44d94182f8fb2feb8670f372 (patch) | |
| tree | 25f57297a093968c70bd6f4495612ae85e27c099 /funcs | |
| parent | 358c7bf39fc742edb89af57527bd1aa8054f20fa (diff) | |
fixes merging error, datastore was being freed in the wrong function.
(closes issue #16219)
Reported by: aragon
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@229669 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_audiohookinherit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/funcs/func_audiohookinherit.c b/funcs/func_audiohookinherit.c index 3a5c1763c..189109569 100644 --- a/funcs/func_audiohookinherit.c +++ b/funcs/func_audiohookinherit.c @@ -77,7 +77,6 @@ static void audiohook_inheritance_fixup(void *data, struct ast_channel *old_chan audiohook->source, old_chan->name, old_chan, new_chan->name, new_chan); } } - ast_free(datastore); return; } @@ -94,6 +93,8 @@ static void audiohook_inheritance_destroy(void *data) while ((inheritable_audiohook = AST_LIST_REMOVE_HEAD(&audiohook_inheritance_datastore->allowed_list, list))) { ast_free(inheritable_audiohook); } + + ast_free(audiohook_inheritance_datastore); } /*! \brief create an audiohook_inheritance_datastore and attach it to a channel |