[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

@ -18,20 +18,25 @@ OpenAPI_snssai_info_t *OpenAPI_snssai_info_create(
void OpenAPI_snssai_info_free(OpenAPI_snssai_info_t *snssai_info)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == snssai_info) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_list_for_each(snssai_info->dnn_infos, node) {
OpenAPI_dnn_info_free(node->data);
if (snssai_info->dnn_infos) {
OpenAPI_list_for_each(snssai_info->dnn_infos, node) {
OpenAPI_dnn_info_free(node->data);
}
OpenAPI_list_free(snssai_info->dnn_infos);
snssai_info->dnn_infos = NULL;
}
OpenAPI_list_free(snssai_info->dnn_infos);
ogs_free(snssai_info);
}
cJSON *OpenAPI_snssai_info_convertToJSON(OpenAPI_snssai_info_t *snssai_info)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (snssai_info == NULL) {
ogs_error("OpenAPI_snssai_info_convertToJSON() failed [SnssaiInfo]");
@ -39,22 +44,22 @@ cJSON *OpenAPI_snssai_info_convertToJSON(OpenAPI_snssai_info_t *snssai_info)
}
item = cJSON_CreateObject();
if (!snssai_info->dnn_infos) {
ogs_error("OpenAPI_snssai_info_convertToJSON() failed [dnn_infos]");
return NULL;
}
cJSON *dnn_infosList = cJSON_AddArrayToObject(item, "dnnInfos");
if (dnn_infosList == NULL) {
ogs_error("OpenAPI_snssai_info_convertToJSON() failed [dnn_infos]");
goto end;
}
OpenAPI_lnode_t *dnn_infos_node;
if (snssai_info->dnn_infos) {
OpenAPI_list_for_each(snssai_info->dnn_infos, dnn_infos_node) {
cJSON *itemLocal = OpenAPI_dnn_info_convertToJSON(dnn_infos_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_snssai_info_convertToJSON() failed [dnn_infos]");
goto end;
}
cJSON_AddItemToArray(dnn_infosList, itemLocal);
OpenAPI_list_for_each(snssai_info->dnn_infos, node) {
cJSON *itemLocal = OpenAPI_dnn_info_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_snssai_info_convertToJSON() failed [dnn_infos]");
goto end;
}
cJSON_AddItemToArray(dnn_infosList, itemLocal);
}
end:
@ -64,43 +69,49 @@ end:
OpenAPI_snssai_info_t *OpenAPI_snssai_info_parseFromJSON(cJSON *snssai_infoJSON)
{
OpenAPI_snssai_info_t *snssai_info_local_var = NULL;
cJSON *dnn_infos = cJSON_GetObjectItemCaseSensitive(snssai_infoJSON, "dnnInfos");
OpenAPI_lnode_t *node = NULL;
cJSON *dnn_infos = NULL;
OpenAPI_list_t *dnn_infosList = NULL;
dnn_infos = cJSON_GetObjectItemCaseSensitive(snssai_infoJSON, "dnnInfos");
if (!dnn_infos) {
ogs_error("OpenAPI_snssai_info_parseFromJSON() failed [dnn_infos]");
goto end;
}
OpenAPI_list_t *dnn_infosList;
cJSON *dnn_infos_local_nonprimitive;
if (!cJSON_IsArray(dnn_infos)){
ogs_error("OpenAPI_snssai_info_parseFromJSON() failed [dnn_infos]");
goto end;
}
dnn_infosList = OpenAPI_list_create();
cJSON_ArrayForEach(dnn_infos_local_nonprimitive, dnn_infos ) {
if (!cJSON_IsObject(dnn_infos_local_nonprimitive)) {
cJSON *dnn_infos_local = NULL;
if (!cJSON_IsArray(dnn_infos)) {
ogs_error("OpenAPI_snssai_info_parseFromJSON() failed [dnn_infos]");
goto end;
}
OpenAPI_dnn_info_t *dnn_infosItem = OpenAPI_dnn_info_parseFromJSON(dnn_infos_local_nonprimitive);
if (!dnn_infosItem) {
ogs_error("No dnn_infosItem");
OpenAPI_list_free(dnn_infosList);
goto end;
dnn_infosList = OpenAPI_list_create();
cJSON_ArrayForEach(dnn_infos_local, dnn_infos) {
if (!cJSON_IsObject(dnn_infos_local)) {
ogs_error("OpenAPI_snssai_info_parseFromJSON() failed [dnn_infos]");
goto end;
}
OpenAPI_dnn_info_t *dnn_infosItem = OpenAPI_dnn_info_parseFromJSON(dnn_infos_local);
if (!dnn_infosItem) {
ogs_error("No dnn_infosItem");
OpenAPI_list_free(dnn_infosList);
goto end;
}
OpenAPI_list_add(dnn_infosList, dnn_infosItem);
}
OpenAPI_list_add(dnn_infosList, dnn_infosItem);
}
snssai_info_local_var = OpenAPI_snssai_info_create (
dnn_infosList
);
return snssai_info_local_var;
end:
if (dnn_infosList) {
OpenAPI_list_for_each(dnn_infosList, node) {
OpenAPI_dnn_info_free(node->data);
}
OpenAPI_list_free(dnn_infosList);
dnn_infosList = NULL;
}
return NULL;
}