[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

@ -22,21 +22,29 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_c
void OpenAPI_app_session_context_resp_data_free(OpenAPI_app_session_context_resp_data_t *app_session_context_resp_data)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == app_session_context_resp_data) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_list_for_each(app_session_context_resp_data->ue_ids, node) {
OpenAPI_ue_identity_info_free(node->data);
if (app_session_context_resp_data->ue_ids) {
OpenAPI_list_for_each(app_session_context_resp_data->ue_ids, node) {
OpenAPI_ue_identity_info_free(node->data);
}
OpenAPI_list_free(app_session_context_resp_data->ue_ids);
app_session_context_resp_data->ue_ids = NULL;
}
if (app_session_context_resp_data->supp_feat) {
ogs_free(app_session_context_resp_data->supp_feat);
app_session_context_resp_data->supp_feat = NULL;
}
OpenAPI_list_free(app_session_context_resp_data->ue_ids);
ogs_free(app_session_context_resp_data->supp_feat);
ogs_free(app_session_context_resp_data);
}
cJSON *OpenAPI_app_session_context_resp_data_convertToJSON(OpenAPI_app_session_context_resp_data_t *app_session_context_resp_data)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (app_session_context_resp_data == NULL) {
ogs_error("OpenAPI_app_session_context_resp_data_convertToJSON() failed [AppSessionContextRespData]");
@ -44,7 +52,7 @@ cJSON *OpenAPI_app_session_context_resp_data_convertToJSON(OpenAPI_app_session_c
}
item = cJSON_CreateObject();
if (app_session_context_resp_data->serv_auth_info) {
if (app_session_context_resp_data->serv_auth_info != OpenAPI_serv_auth_info_NULL) {
if (cJSON_AddStringToObject(item, "servAuthInfo", OpenAPI_serv_auth_info_ToString(app_session_context_resp_data->serv_auth_info)) == NULL) {
ogs_error("OpenAPI_app_session_context_resp_data_convertToJSON() failed [serv_auth_info]");
goto end;
@ -57,17 +65,13 @@ cJSON *OpenAPI_app_session_context_resp_data_convertToJSON(OpenAPI_app_session_c
ogs_error("OpenAPI_app_session_context_resp_data_convertToJSON() failed [ue_ids]");
goto end;
}
OpenAPI_lnode_t *ue_ids_node;
if (app_session_context_resp_data->ue_ids) {
OpenAPI_list_for_each(app_session_context_resp_data->ue_ids, ue_ids_node) {
cJSON *itemLocal = OpenAPI_ue_identity_info_convertToJSON(ue_ids_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_app_session_context_resp_data_convertToJSON() failed [ue_ids]");
goto end;
}
cJSON_AddItemToArray(ue_idsList, itemLocal);
OpenAPI_list_for_each(app_session_context_resp_data->ue_ids, node) {
cJSON *itemLocal = OpenAPI_ue_identity_info_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_app_session_context_resp_data_convertToJSON() failed [ue_ids]");
goto end;
}
cJSON_AddItemToArray(ue_idsList, itemLocal);
}
}
@ -85,9 +89,13 @@ end:
OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_parseFromJSON(cJSON *app_session_context_resp_dataJSON)
{
OpenAPI_app_session_context_resp_data_t *app_session_context_resp_data_local_var = NULL;
cJSON *serv_auth_info = cJSON_GetObjectItemCaseSensitive(app_session_context_resp_dataJSON, "servAuthInfo");
OpenAPI_serv_auth_info_e serv_auth_infoVariable;
OpenAPI_lnode_t *node = NULL;
cJSON *serv_auth_info = NULL;
OpenAPI_serv_auth_info_e serv_auth_infoVariable = 0;
cJSON *ue_ids = NULL;
OpenAPI_list_t *ue_idsList = NULL;
cJSON *supp_feat = NULL;
serv_auth_info = cJSON_GetObjectItemCaseSensitive(app_session_context_resp_dataJSON, "servAuthInfo");
if (serv_auth_info) {
if (!cJSON_IsString(serv_auth_info)) {
ogs_error("OpenAPI_app_session_context_resp_data_parseFromJSON() failed [serv_auth_info]");
@ -96,39 +104,34 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_p
serv_auth_infoVariable = OpenAPI_serv_auth_info_FromString(serv_auth_info->valuestring);
}
cJSON *ue_ids = cJSON_GetObjectItemCaseSensitive(app_session_context_resp_dataJSON, "ueIds");
OpenAPI_list_t *ue_idsList;
ue_ids = cJSON_GetObjectItemCaseSensitive(app_session_context_resp_dataJSON, "ueIds");
if (ue_ids) {
cJSON *ue_ids_local_nonprimitive;
if (!cJSON_IsArray(ue_ids)){
ogs_error("OpenAPI_app_session_context_resp_data_parseFromJSON() failed [ue_ids]");
goto end;
}
ue_idsList = OpenAPI_list_create();
cJSON_ArrayForEach(ue_ids_local_nonprimitive, ue_ids ) {
if (!cJSON_IsObject(ue_ids_local_nonprimitive)) {
cJSON *ue_ids_local = NULL;
if (!cJSON_IsArray(ue_ids)) {
ogs_error("OpenAPI_app_session_context_resp_data_parseFromJSON() failed [ue_ids]");
goto end;
}
OpenAPI_ue_identity_info_t *ue_idsItem = OpenAPI_ue_identity_info_parseFromJSON(ue_ids_local_nonprimitive);
if (!ue_idsItem) {
ogs_error("No ue_idsItem");
OpenAPI_list_free(ue_idsList);
goto end;
ue_idsList = OpenAPI_list_create();
cJSON_ArrayForEach(ue_ids_local, ue_ids) {
if (!cJSON_IsObject(ue_ids_local)) {
ogs_error("OpenAPI_app_session_context_resp_data_parseFromJSON() failed [ue_ids]");
goto end;
}
OpenAPI_ue_identity_info_t *ue_idsItem = OpenAPI_ue_identity_info_parseFromJSON(ue_ids_local);
if (!ue_idsItem) {
ogs_error("No ue_idsItem");
OpenAPI_list_free(ue_idsList);
goto end;
}
OpenAPI_list_add(ue_idsList, ue_idsItem);
}
OpenAPI_list_add(ue_idsList, ue_idsItem);
}
}
cJSON *supp_feat = cJSON_GetObjectItemCaseSensitive(app_session_context_resp_dataJSON, "suppFeat");
supp_feat = cJSON_GetObjectItemCaseSensitive(app_session_context_resp_dataJSON, "suppFeat");
if (supp_feat) {
if (!cJSON_IsString(supp_feat)) {
if (!cJSON_IsString(supp_feat) && !cJSON_IsNull(supp_feat)) {
ogs_error("OpenAPI_app_session_context_resp_data_parseFromJSON() failed [supp_feat]");
goto end;
}
@ -137,11 +140,18 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_p
app_session_context_resp_data_local_var = OpenAPI_app_session_context_resp_data_create (
serv_auth_info ? serv_auth_infoVariable : 0,
ue_ids ? ue_idsList : NULL,
supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL
supp_feat && !cJSON_IsNull(supp_feat) ? ogs_strdup(supp_feat->valuestring) : NULL
);
return app_session_context_resp_data_local_var;
end:
if (ue_idsList) {
OpenAPI_list_for_each(ue_idsList, node) {
OpenAPI_ue_identity_info_free(node->data);
}
OpenAPI_list_free(ue_idsList);
ue_idsList = NULL;
}
return NULL;
}