diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-13 19:33:04 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-13 19:33:04 +0000 |
| commit | 90c803b30227db206df082d3724773e53ec4c80b (patch) | |
| tree | 180d5f65270661fe76231648fa4090aa7c2de60b /res | |
| parent | 5a9c198ac05134d0e318454e55cc73f687ff9539 (diff) | |
Merged revisions 188102 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@188104 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 9f84a9378..4d70b575f 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1062,7 +1062,9 @@ static int moh_register(struct mohclass *moh, int reload, int unref) if (!mohclass->delete) { 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"); - 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; } mohclass = mohclass_unref(mohclass, "Unreffing mohclass we just found by name"); |