From a1037d3d7ec6cea84c546919ddb79942ff47a8d5 Mon Sep 17 00:00:00 2001
From: David Vossel <dvossel@digium.com>
Date: Thu, 12 Nov 2009 16:44:39 +0000
Subject: [PATCH] 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/trunk@229670 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 74f89b9a3e..528aed51fb 100644
--- a/funcs/func_audiohookinherit.c
+++ b/funcs/func_audiohookinherit.c
@@ -126,7 +126,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;
}
@@ -143,6 +142,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
--
GitLab