kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 08:49:01 +00:00
Code Issues Projects Releases Wiki Activity

FS-11554: fix crash in conference API when no param given to "moh".

Browse Source
This commit is contained in:
Dragos Oancea 2018-12-05 21:30:03 -05:00
parent 362c5f8b22
commit 551ce4c46f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mod/applications/mod_conference/conference_api.c
View File

@ -2709,6 +2709,9 @@ switch_status_t conference_api_sub_file_seek(conference_obj_t *conference, switc
switch_status_t conference_api_set_moh(conference_obj_t *conference, const char *what) switch_status_t conference_api_set_moh(conference_obj_t *conference, const char *what)
{ {
if (!what) {
return SWITCH_STATUS_FALSE;
}
if (!strcasecmp(what, "toggle")) { if (!strcasecmp(what, "toggle")) {
if (conference_utils_test_flag(conference, CFLAG_NO_MOH)) { if (conference_utils_test_flag(conference, CFLAG_NO_MOH)) {
@ -2737,7 +2740,15 @@ switch_status_t conference_api_set_moh(conference_obj_t *conference, const char
switch_status_t conference_api_sub_moh(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv) switch_status_t conference_api_sub_moh(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
{ {
conference_api_set_moh(conference, argv[2]); if (conference_api_set_moh(conference, argv[2]) == SWITCH_STATUS_SUCCESS) {
if (stream) {
stream->write_function(stream, "+OK moh\n");
}
} else {
if (stream) {
stream->write_function(stream, "-ERR invalid moh param\n");
}
}
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }