kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

FS-11785 [mod_conference] fix scan-build NULL dereferences

Browse Source
This commit is contained in:
Chris Rienzo 2019-04-16 13:36:43 +00:00 committed by Andrey Volk
parent ca8fa0e1ff
commit c6990e7a74
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1215,8 +1215,10 @@ switch_status_t conference_api_sub_energy(conference_member_t *member, switch_st
if (member->auto_energy_level && member->energy_level > member->auto_energy_level) {
member->auto_energy_level = 0;
if (stream != NULL) {
stream->write_function(stream, "Auto-Energy level exceeded, Auto-Energy mode disabled\n", SWITCH_VA_NONE);
}
}
if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL_MEMBER) &&
@ -1273,7 +1275,7 @@ void conference_api_set_agc(conference_member_t *member, const char *data)
}
if (argv[2]) {
if (argv[0]) {
tmp = atoi(argv[0]);
if (tmp > 0) {
@ -2076,11 +2078,16 @@ switch_status_t conference_api_sub_vid_layout(conference_obj_t *conference, swit
if (conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS)) {
if (vlayout) {
stream->write_function(stream, "+OK Change personal canvas set to layout [%s]\n", vlayout->name);
switch_mutex_lock(conference->member_mutex);
conference->new_personal_vlayout = vlayout;
switch_mutex_unlock(conference->member_mutex);
} else {
stream->write_function(stream, "-ERR no layout for personal canvas\n");
return SWITCH_STATUS_SUCCESS;
}
} else {
switch_mutex_lock(conference->canvases[idx]->mutex);
if (vlayout) {