kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 06:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 229670 via svnmerge from

Browse Source 
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
This commit is contained in:
David Vossel
2009-11-12 16:48:46 +00:00
parent 5d1f84bd3a
commit d8cf07c8fb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
funcs/func_audiohookinherit.c
View File

@@ -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