Skip to content

F
freeswitch
提交 59f9157e authored 作者: Mike Jerris's avatar Mike Jerris
浏览文件
操作

FS-10300: [mod_verto] fix crash in multiple verto messages when processing… 

FS-10300: [mod_verto] fix crash in multiple verto messages when processing messages with missing params
上级 5ffe9d8c
显示空白字符变更
内嵌 并排
正在显示 包含 59 行增加 和 11 行删除
src/mod/endpoints/mod_verto/mod_verto.c
浏览文件 @ 59f9157e
......@@ -870,10 +870,12 @@ static void login_fire_custom_event(jsock_t *jsock, cJSON *params, int success,
if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_LOGIN) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "verto_profile_name", jsock->profile->name);
switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "verto_client_address", jsock->name);
if (params) {
switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "verto_login", cJSON_GetObjectCstr(params, "login"));
if (success) {
switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "verto_sessid", cJSON_GetObjectCstr(params, "sessid"));
}
}
switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "verto_success", "%d", success);
switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "verto_result_txt", result_txt);
switch_event_fire(&s_event);
......@@ -2653,6 +2655,11 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock
*response = obj;
if (!params) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Params data missing"));
err = 1; goto cleanup;
}
if (!(dialog = cJSON_GetObjectItem(params, "dialogParams"))) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Dialog data missing"));
err = 1; goto cleanup;
......@@ -2746,6 +2753,11 @@ static switch_bool_t verto__bye_func(const char *method, cJSON *params, jsock_t
*response = obj;
if (!params) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Params data missing"));
err = 1; goto cleanup;
}
if (!(dialog = cJSON_GetObjectItem(params, "dialogParams"))) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Dialog data missing"));
err = 1; goto cleanup;
......@@ -3076,6 +3088,11 @@ static switch_bool_t verto__modify_func(const char *method, cJSON *params, jsock
*response = obj;
if (!params) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Params data missing"));
err = 1; goto cleanup;
}
if (!(dialog = cJSON_GetObjectItem(params, "dialogParams"))) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Dialog data missing"));
err = 1; goto cleanup;
......@@ -3177,6 +3194,11 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock
*response = obj;
if (!params) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Params data missing"));
err = 1; goto cleanup;
}
if (!(dialog = cJSON_GetObjectItem(params, "dialogParams"))) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Dialog data missing"));
err = 1; goto cleanup;
......@@ -3293,9 +3315,15 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
switch_bool_t r = SWITCH_TRUE;
char *proto = VERTO_CHAT_PROTO;
char *pproto = NULL;
int err = 0;
*response = cJSON_CreateObject();
if (!params) {
cJSON_AddItemToObject(*response, "message", cJSON_CreateString("Params data missing"));
err = 1; goto cleanup;
}
if ((dialog = cJSON_GetObjectItem(params, "dialogParams")) && (call_id = cJSON_GetObjectCstr(dialog, "callID"))) {
switch_core_session_t *session = NULL;
......@@ -3403,8 +3431,13 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
switch_safe_free(pproto);
}
cleanup:
return r;
if (!err) return r;
cJSON_AddItemToObject(*response, "code", cJSON_CreateNumber(CODE_SESSION_ERROR));
return SWITCH_FALSE;
}
static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response)
......@@ -3425,6 +3458,11 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
*response = obj;
if (!params) {
cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Params data missing"));
err = 1; goto cleanup;
}
if (switch_event_create_plain(&var_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) {
err=1; goto cleanup;
}
......@@ -3907,8 +3945,17 @@ static switch_bool_t login_func(const char *method, cJSON *params, jsock_t *jsoc
static switch_bool_t echo_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response)
{
if (params) {
*response = cJSON_Duplicate(params, 1);
return SWITCH_TRUE;
}
*response = cJSON_CreateObject();
cJSON_AddItemToObject(*response, "message", cJSON_CreateString("Params data missing"));
cJSON_AddItemToObject(*response, "code", cJSON_CreateNumber(CODE_SESSION_ERROR));
return SWITCH_FALSE;
}
static switch_bool_t jsapi_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response)
......@@ -3945,13 +3992,14 @@ static switch_bool_t jsapi_func(const char *method, cJSON *params, jsock_t *jsoc
static switch_bool_t fsapi_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response)
{
cJSON *cmd, *arg, *reply;
cJSON *cmd = NULL, *arg = NULL, *reply;
switch_stream_handle_t stream = { 0 };
switch_status_t status = SWITCH_STATUS_SUCCESS;
if (params) {
cmd = cJSON_GetObjectItem(params, "cmd");
arg = cJSON_GetObjectItem(params, "arg");
}
if (cmd && jsock->allowed_fsapi) {
if (cmd->type == cJSON_String && cmd->valuestring && !auth_api_command(jsock, cmd->valuestring, arg ? arg->valuestring : NULL)) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论