[asterisk-commits] mjordan: trunk r416267 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Jun 15 16:24:04 2014
New Revision: 416267

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416267
Log:
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
........

Merged revisions 416255 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=416267&r1=416266&r2=416267
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Sun Jun 15 16:24:04 2014
@@ -1413,7 +1413,7 @@
 	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:
@@ -1601,12 +1601,10 @@
 		}
 	}
 
-	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);