From 8d848c048d07d4bfb04273584aadd21e1f8be8cb Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Sun, 15 Jun 2014 21:17:02 +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.
........
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
---
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 c1b3c0e9f7..bbc7a162d8 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1360,7 +1360,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:
@@ -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);
- 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");
--
GitLab