From d8cf07c8fbfd62d14c7bf7b42f9fffcb83205ff8 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Thu, 12 Nov 2009 16:48:46 +0000 Subject: [PATCH] Merged revisions 229670 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r229670 | dvossel | 2009-11-12 10:44:39 -0600 (Thu, 12 Nov 2009) | 12 lines Merged revisions 229669 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r229669 | dvossel | 2009-11-12 10:41:49 -0600 (Thu, 12 Nov 2009) | 6 lines fixes merging error, datastore was being freed in the wrong function. (closes issue #16219) Reported by: aragon ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@229672 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_audiohookinherit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/funcs/func_audiohookinherit.c b/funcs/func_audiohookinherit.c index 9492d28324..2b1dc3c410 100644 --- a/funcs/func_audiohookinherit.c +++ b/funcs/func_audiohookinherit.c @@ -74,7 +74,6 @@ static void audiohook_inheritance_fixup(void *data, struct ast_channel *old_chan ast_debug(3, "Moved audiohook %s from %s(%p) to %s(%p)\n", audiohook->source, old_chan->name, old_chan, new_chan->name, new_chan); } - ast_free(datastore); return; } @@ -91,6 +90,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 -- 2.47.2