[SBI] Crash occurs when ENUM in the MAP (#2103)

This commit is contained in:
Sukchan Lee 2023-03-01 17:50:25 +09:00
parent ce668c556c
commit 969c116e77
1097 changed files with 266728 additions and 42047 deletions

View file

@ -28,22 +28,42 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_create(
void OpenAPI_session_rule_free(OpenAPI_session_rule_t *session_rule)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == session_rule) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_ambr_free(session_rule->auth_sess_ambr);
OpenAPI_authorized_default_qos_free(session_rule->auth_def_qos);
ogs_free(session_rule->sess_rule_id);
ogs_free(session_rule->ref_um_data);
ogs_free(session_rule->ref_um_n3g_data);
ogs_free(session_rule->ref_cond_data);
if (session_rule->auth_sess_ambr) {
OpenAPI_ambr_free(session_rule->auth_sess_ambr);
session_rule->auth_sess_ambr = NULL;
}
if (session_rule->auth_def_qos) {
OpenAPI_authorized_default_qos_free(session_rule->auth_def_qos);
session_rule->auth_def_qos = NULL;
}
if (session_rule->sess_rule_id) {
ogs_free(session_rule->sess_rule_id);
session_rule->sess_rule_id = NULL;
}
if (session_rule->ref_um_data) {
ogs_free(session_rule->ref_um_data);
session_rule->ref_um_data = NULL;
}
if (session_rule->ref_um_n3g_data) {
ogs_free(session_rule->ref_um_n3g_data);
session_rule->ref_um_n3g_data = NULL;
}
if (session_rule->ref_cond_data) {
ogs_free(session_rule->ref_cond_data);
session_rule->ref_cond_data = NULL;
}
ogs_free(session_rule);
}
cJSON *OpenAPI_session_rule_convertToJSON(OpenAPI_session_rule_t *session_rule)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (session_rule == NULL) {
ogs_error("OpenAPI_session_rule_convertToJSON() failed [SessionRule]");
@ -77,6 +97,10 @@ cJSON *OpenAPI_session_rule_convertToJSON(OpenAPI_session_rule_t *session_rule)
}
}
if (!session_rule->sess_rule_id) {
ogs_error("OpenAPI_session_rule_convertToJSON() failed [sess_rule_id]");
return NULL;
}
if (cJSON_AddStringToObject(item, "sessRuleId", session_rule->sess_rule_id) == NULL) {
ogs_error("OpenAPI_session_rule_convertToJSON() failed [sess_rule_id]");
goto end;
@ -110,53 +134,54 @@ end:
OpenAPI_session_rule_t *OpenAPI_session_rule_parseFromJSON(cJSON *session_ruleJSON)
{
OpenAPI_session_rule_t *session_rule_local_var = NULL;
cJSON *auth_sess_ambr = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "authSessAmbr");
OpenAPI_lnode_t *node = NULL;
cJSON *auth_sess_ambr = NULL;
OpenAPI_ambr_t *auth_sess_ambr_local_nonprim = NULL;
cJSON *auth_def_qos = NULL;
OpenAPI_authorized_default_qos_t *auth_def_qos_local_nonprim = NULL;
cJSON *sess_rule_id = NULL;
cJSON *ref_um_data = NULL;
cJSON *ref_um_n3g_data = NULL;
cJSON *ref_cond_data = NULL;
auth_sess_ambr = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "authSessAmbr");
if (auth_sess_ambr) {
auth_sess_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(auth_sess_ambr);
}
cJSON *auth_def_qos = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "authDefQos");
OpenAPI_authorized_default_qos_t *auth_def_qos_local_nonprim = NULL;
auth_def_qos = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "authDefQos");
if (auth_def_qos) {
auth_def_qos_local_nonprim = OpenAPI_authorized_default_qos_parseFromJSON(auth_def_qos);
}
cJSON *sess_rule_id = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "sessRuleId");
sess_rule_id = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "sessRuleId");
if (!sess_rule_id) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [sess_rule_id]");
goto end;
}
if (!cJSON_IsString(sess_rule_id)) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [sess_rule_id]");
goto end;
}
cJSON *ref_um_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refUmData");
ref_um_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refUmData");
if (ref_um_data) {
if (!cJSON_IsString(ref_um_data)) {
if (!cJSON_IsString(ref_um_data) && !cJSON_IsNull(ref_um_data)) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [ref_um_data]");
goto end;
}
}
cJSON *ref_um_n3g_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refUmN3gData");
ref_um_n3g_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refUmN3gData");
if (ref_um_n3g_data) {
if (!cJSON_IsString(ref_um_n3g_data)) {
if (!cJSON_IsString(ref_um_n3g_data) && !cJSON_IsNull(ref_um_n3g_data)) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [ref_um_n3g_data]");
goto end;
}
}
cJSON *ref_cond_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refCondData");
ref_cond_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refCondData");
if (ref_cond_data) {
if (!cJSON_IsString(ref_cond_data)) {
if (!cJSON_IsString(ref_cond_data) && !cJSON_IsNull(ref_cond_data)) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [ref_cond_data]");
goto end;
}
@ -166,13 +191,21 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_parseFromJSON(cJSON *session_ruleJS
auth_sess_ambr ? auth_sess_ambr_local_nonprim : NULL,
auth_def_qos ? auth_def_qos_local_nonprim : NULL,
ogs_strdup(sess_rule_id->valuestring),
ref_um_data ? ogs_strdup(ref_um_data->valuestring) : NULL,
ref_um_n3g_data ? ogs_strdup(ref_um_n3g_data->valuestring) : NULL,
ref_cond_data ? ogs_strdup(ref_cond_data->valuestring) : NULL
ref_um_data && !cJSON_IsNull(ref_um_data) ? ogs_strdup(ref_um_data->valuestring) : NULL,
ref_um_n3g_data && !cJSON_IsNull(ref_um_n3g_data) ? ogs_strdup(ref_um_n3g_data->valuestring) : NULL,
ref_cond_data && !cJSON_IsNull(ref_cond_data) ? ogs_strdup(ref_cond_data->valuestring) : NULL
);
return session_rule_local_var;
end:
if (auth_sess_ambr_local_nonprim) {
OpenAPI_ambr_free(auth_sess_ambr_local_nonprim);
auth_sess_ambr_local_nonprim = NULL;
}
if (auth_def_qos_local_nonprim) {
OpenAPI_authorized_default_qos_free(auth_def_qos_local_nonprim);
auth_def_qos_local_nonprim = NULL;
}
return NULL;
}