From: David Vossel Date: Thu, 12 Nov 2009 16:41:49 +0000 (+0000) Subject: fixes merging error, datastore was being freed in the wrong function. X-Git-Tag: 1.4.27-rc5~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=251f1967609606f2fb9e335bf5f4670ce35a7194;p=thirdparty%2Fasterisk.git 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.4@229669 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/funcs/func_audiohookinherit.c b/funcs/func_audiohookinherit.c index 3a5c1763c5..1891095695 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