Skip to content
Snippets Groups Projects
Commit a1037d3d authored by David Vossel's avatar David Vossel
Browse files

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
parent e7c7dac8
No related branches found
No related tags found
No related merge requests found
...@@ -126,7 +126,6 @@ static void audiohook_inheritance_fixup(void *data, struct ast_channel *old_chan ...@@ -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", 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); audiohook->source, old_chan->name, old_chan, new_chan->name, new_chan);
} }
ast_free(datastore);
return; return;
} }
...@@ -143,6 +142,8 @@ static void audiohook_inheritance_destroy(void *data) ...@@ -143,6 +142,8 @@ static void audiohook_inheritance_destroy(void *data)
while ((inheritable_audiohook = AST_LIST_REMOVE_HEAD(&audiohook_inheritance_datastore->allowed_list, list))) { while ((inheritable_audiohook = AST_LIST_REMOVE_HEAD(&audiohook_inheritance_datastore->allowed_list, list))) {
ast_free(inheritable_audiohook); ast_free(inheritable_audiohook);
} }
ast_free(audiohook_inheritance_datastore);
} }
/*! \brief create an audiohook_inheritance_datastore and attach it to a channel /*! \brief create an audiohook_inheritance_datastore and attach it to a channel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment