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

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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index bc9777f..6154f33 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1413,7 +1413,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:
@@ -1601,12 +1601,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);