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

MoH: Undo commit r416150 (1.8)

Browse Source 
This patch reverts r416150. When the comparison between mohclass->name and
state->class->name is made, you are not guaranteed that (a) state->class is
non-NULL or that state or state->class are in a safe state.

Crashes caught by the bridges/transfer_capabilities test.
........

Merged revisions 416251 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@416252 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-06-15 21:17:02 +00:00
parent 71c9c7612e
commit 8d848c048d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_musiconhold.c
View File

@@ -1360,7 +1360,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
struct mohclass *mohclass = NULL; struct mohclass *mohclass = NULL;
struct moh_files_state *state = ast_channel_music_state(chan); struct moh_files_state *state = ast_channel_music_state(chan);
struct ast_variable *var = NULL; struct ast_variable *var = NULL;
int res = 0; int res;
int realtime_possible = ast_check_realtime("musiconhold"); int realtime_possible = ast_check_realtime("musiconhold");
/* The following is the order of preference for which class to use: /* The following is the order of preference for which class to use:
@@ -1558,12 +1558,10 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
ast_set_flag(ast_channel_flags(chan), AST_FLAG_MOH); ast_set_flag(ast_channel_flags(chan), AST_FLAG_MOH);
if (!state || strcmp(mohclass->name, state->class->name)) { if (mohclass->total_files) {
if (mohclass->total_files) { res = ast_activate_generator(chan, &moh_file_stream, mohclass);
res = ast_activate_generator(chan, &moh_file_stream, mohclass); } else {
} else { res = ast_activate_generator(chan, &mohgen, mohclass);
res = ast_activate_generator(chan, &mohgen, mohclass);
}
} }
mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start"); mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start");