[asterisk-commits] mjordan: branch 1.8 r416251 - /branches/1.8/res/res_musiconhold.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Jun 15 16:16:25 CDT 2014
Author: mjordan
Date: Sun Jun 15 16:16:17 2014
New Revision: 416251
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416251
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.
Modified:
branches/1.8/res/res_musiconhold.c
Modified: branches/1.8/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_musiconhold.c?view=diff&rev=416251&r1=416250&r2=416251
==============================================================================
--- branches/1.8/res/res_musiconhold.c (original)
+++ branches/1.8/res/res_musiconhold.c Sun Jun 15 16:16:17 2014
@@ -1320,7 +1320,7 @@
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 @@
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");
More information about the asterisk-commits
mailing list