Merge pull request #1232 in FS/freeswitch from ~ANTONIO/freeswitch:bugfix/FS-10160-segfault-conference-with-parameter to master

* commit '2ec5ffb5f5f58fe19f0e9f5abe274424d39206a1':
  FS-10160 [mod_conference] fix segfault when using video-mode=mux
This commit is contained in:
Mike Jerris 2017-03-21 16:45:26 +00:00
commit 82a9a3e610
1 changed files with 4 additions and 0 deletions

View File

@ -576,6 +576,10 @@ void conference_event_adv_layout(conference_obj_t *conference, mcu_canvas_t *can
cJSON *msg, *data, *obj;
int i = 0;
if (!conference->info_event_channel) {
return;
}
msg = cJSON_CreateObject();
data = json_add_child_obj(msg, "eventData", NULL);