From: Matthew Jordan <mjordan@digium.com>
Date: Sun, 15 Jun 2014 21:18:51 +0000 (+0000)
Subject: MoH: Undo commit r416150 (1.8)
X-Git-Tag: 12.4.0-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a1498a2556f2b2cdaa273062bc45878453e2ae7;p=thirdparty%2Fasterisk.git

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.
........

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

Merged revisions 416252 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@416255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index c5d857e94d..38e47546e6 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1408,7 +1408,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 	struct mohclass *mohclass = NULL;
 	struct moh_files_state *state = ast_channel_music_state(chan);
 	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:
@@ -1596,12 +1596,10 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 		}
 	}
 
-	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);
 	}
 	if (!res) {
 		ast_channel_latest_musicclass_set(chan, mohclass->name);