From 6b782f84b80ce7d9a19c7ed63f1c9eb4bd9d13b7 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Sun, 15 Jun 2014 21:16:17 +0000 Subject: [PATCH] MoH: Undo commit r416150 (1.8) 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@416251 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_musiconhold.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 29ebd256c2..3baffd1416 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1320,7 +1320,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con struct mohclass *mohclass = NULL; struct moh_files_state *state = chan->music_state; struct ast_variable *var = NULL; - int res = 0; + int res; int realtime_possible = ast_check_realtime("musiconhold"); /* The following is the order of preference for which class to use: @@ -1518,12 +1518,10 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con ast_set_flag(chan, AST_FLAG_MOH); - if (!state || strcmp(mohclass->name, state->class->name)) { - if (mohclass->total_files) { - res = ast_activate_generator(chan, &moh_file_stream, mohclass); - } else { - res = ast_activate_generator(chan, &mohgen, mohclass); - } + if (mohclass->total_files) { + res = ast_activate_generator(chan, &moh_file_stream, mohclass); + } else { + res = ast_activate_generator(chan, &mohgen, mohclass); } mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start");