kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1635 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:bugfix/FS-11554-conference-moh-null-check to master 

* commit '551ce4c46f0a497829585a4c640a4eebb2148df9':
  FS-11554: fix crash in conference API when no param given to "moh".
This commit is contained in:
Andrey Volk 2018-12-06 17:38:37 +00:00
parent 362c5f8b22 551ce4c46f
commit 7e890c456e
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)
{
if (!what) {
return SWITCH_STATUS_FALSE;
}
if (!strcasecmp(what, "toggle")) {
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)
{
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;
}