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

FS-11785 [mod_dptools] fix dead assignment and potential dereference of null pointer

This commit is contained in:
Chris Rienzo 2019-04-16 18:28:42 +00:00 committed by Andrey Volk
parent 19b09689c8
commit 0171a64a76
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -160,7 +160,7 @@ static switch_status_t digit_action_callback(switch_ivr_dmachine_match_t *match)
switch_status_t status; switch_status_t status;
int exec = 0; int exec = 0;
int api = 0; int api = 0;
char *string = act->string; char *string = NULL;
switch_channel_t *channel; switch_channel_t *channel;
switch_core_session_t *use_session = act->session; switch_core_session_t *use_session = act->session;
int x = 0; int x = 0;
@ -3532,7 +3532,6 @@ SWITCH_STANDARD_APP(audio_bridge_function)
} }
if (status == SWITCH_STATUS_SUCCESS) { if (status == SWITCH_STATUS_SUCCESS) {
camping = 0;
break; break;
} else { } else {
fail = 1; fail = 1;
@ -3554,7 +3553,6 @@ SWITCH_STANDARD_APP(audio_bridge_function)
if (camp_loops++) { if (camp_loops++) {
if (--campon_retries <= 0 || stake.do_xfer) { if (--campon_retries <= 0 || stake.do_xfer) {
camping = 0;
stake.do_xfer = 1; stake.do_xfer = 1;
break; break;
} }
@ -5824,7 +5822,7 @@ void *SWITCH_THREAD_FUNC call_monitor_thread(switch_thread_t *thread, void *obj)
data++; data++;
} }
while (*data == '<') { while (data && *data == '<') {
char *parsed = NULL; char *parsed = NULL;
if (switch_event_create_brackets(data, '<', '>', ',', &var_event, &parsed, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS || !parsed) { if (switch_event_create_brackets(data, '<', '>', ',', &var_event, &parsed, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS || !parsed) {
@ -6026,7 +6024,7 @@ SWITCH_STANDARD_API(page_api_function)
char *oexten = NULL; char *oexten = NULL;
const char *context = NULL; const char *context = NULL;
const char *dp = "inline"; const char *dp = "inline";
const char *pdata = data; const char *pdata = NULL;
const char *l; const char *l;
uint32_t chunk_size = 10; uint32_t chunk_size = 10;
const char *path; const char *path;
@ -6044,7 +6042,7 @@ SWITCH_STANDARD_API(page_api_function)
data++; data++;
} }
while (*data == '(') { while (data && *data == '(') {
char *parsed = NULL; char *parsed = NULL;
if (switch_event_create_brackets(data, '(', ')', ',', &var_event, &parsed, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS || !parsed) { if (switch_event_create_brackets(data, '(', ')', ',', &var_event, &parsed, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS || !parsed) {