kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 188102 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188102 | mmichelson | 2009-04-13 14:31:48 -0500 (Mon, 13 Apr 2009) | 5 lines
  
  Fix another crash related to cached realtime music on hold.
  
  This was another off-by-one problem caused by moh_register.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@188104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-04-13 19:33:04 +00:00
parent fff7b320c9
commit fa01f5b0b1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_musiconhold.c
View File

@@ -1062,7 +1062,9 @@ static int moh_register(struct mohclass *moh, int reload, int unref)
if (!mohclass->delete) { if (!mohclass->delete) {
ast_log(LOG_WARNING, "Music on Hold class '%s' already exists\n", moh->name); ast_log(LOG_WARNING, "Music on Hold class '%s' already exists\n", moh->name);
mohclass = mohclass_unref(mohclass, "unreffing mohclass we just found by name"); mohclass = mohclass_unref(mohclass, "unreffing mohclass we just found by name");
moh = mohclass_unref(moh, "unreffing potential new moh class (it is a duplicate)"); if (unref) {
moh = mohclass_unref(moh, "unreffing potential new moh class (it is a duplicate)");
}
return -1; return -1;
} }
mohclass = mohclass_unref(mohclass, "Unreffing mohclass we just found by name"); mohclass = mohclass_unref(mohclass, "Unreffing mohclass we just found by name");