kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a potential segfault if chan (or chan->music_state) is NULL.

Browse Source 
Closes issue #12210, credit to edantie for pointing this out.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@108682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-03-14 14:29:05 +00:00
parent efa3b46cdf
commit 503ca9f30c
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/res_musiconhold.c
View File

@@ -200,23 +200,26 @@ static void ast_moh_free_class(struct mohclass **mohclass)
static void moh_files_release(struct ast_channel *chan, void *data) static void moh_files_release(struct ast_channel *chan, void *data)
{ {
struct moh_files_state *state = chan->music_state; struct moh_files_state *state;
if (chan && state) { if (chan) {
if (chan->stream) { if ((state = chan->music_state)) {
ast_closestream(chan->stream); if (chan->stream) {
chan->stream = NULL; ast_closestream(chan->stream);
} chan->stream = NULL;
if (option_verbose > 2) }
ast_verbose(VERBOSE_PREFIX_3 "Stopped music on hold on %s\n", chan->name); if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Stopped music on hold on %s\n", chan->name);
if (state->origwfmt && ast_set_write_format(chan, state->origwfmt)) {
ast_log(LOG_WARNING, "Unable to restore channel '%s' to format '%d'\n", chan->name, state->origwfmt);
}
state->save_pos = state->pos;
if (state->origwfmt && ast_set_write_format(chan, state->origwfmt)) { if (ast_atomic_dec_and_test(&state->class->inuse) && state->class->delete)
ast_log(LOG_WARNING, "Unable to restore channel '%s' to format '%d'\n", chan->name, state->origwfmt); ast_moh_destroy_one(state->class);
} }
state->save_pos = state->pos;
} }
if (ast_atomic_dec_and_test(&state->class->inuse) && state->class->delete)
ast_moh_destroy_one(state->class);
} }