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

follow commit 0bec209a, we should still allow NULL arg

This commit is contained in:
Seven Du 2015-01-08 11:38:53 +08:00
parent 6afc2b5a2e
commit 1ed290e930
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/endpoints/mod_verto/mod_verto.c
View File

@ -3583,15 +3583,14 @@ static switch_bool_t jsapi_func(const char *method, cJSON *params, jsock_t *jsoc
if (jsock->allowed_fsapi && !strcmp(function, "fsapi")) {
cJSON *data = cJSON_GetObjectItem(params, "data");
cJSON *cmd;
cJSON *arg;
if (data) {
cJSON *cmd = cJSON_GetObjectItem(data, "cmd");
cJSON *arg = cJSON_GetObjectItem(data, "arg");
if (data &&
(cmd = cJSON_GetObjectItem(data, "cmd")) &&
(arg = cJSON_GetObjectItem(data, "arg")) &&
cmd->type == cJSON_String && cmd->valuestring &&
!auth_api_command(jsock, cmd->valuestring, arg ? arg->valuestring : NULL)) {
return SWITCH_FALSE;
if (cmd && cmd->type == cJSON_String && cmd->valuestring &&
!auth_api_command(jsock, cmd->valuestring, arg ? arg->valuestring : NULL)) {
return SWITCH_FALSE;
}
}
}
}