[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,22 +22,33 @@ OpenAPI_allowed_snssai_t *OpenAPI_allowed_snssai_create(
void OpenAPI_allowed_snssai_free(OpenAPI_allowed_snssai_t *allowed_snssai)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == allowed_snssai) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_snssai_free(allowed_snssai->allowed_snssai);
OpenAPI_list_for_each(allowed_snssai->nsi_information_list, node) {
OpenAPI_nsi_information_free(node->data);
if (allowed_snssai->allowed_snssai) {
OpenAPI_snssai_free(allowed_snssai->allowed_snssai);
allowed_snssai->allowed_snssai = NULL;
}
if (allowed_snssai->nsi_information_list) {
OpenAPI_list_for_each(allowed_snssai->nsi_information_list, node) {
OpenAPI_nsi_information_free(node->data);
}
OpenAPI_list_free(allowed_snssai->nsi_information_list);
allowed_snssai->nsi_information_list = NULL;
}
if (allowed_snssai->mapped_home_snssai) {
OpenAPI_snssai_free(allowed_snssai->mapped_home_snssai);
allowed_snssai->mapped_home_snssai = NULL;
}
OpenAPI_list_free(allowed_snssai->nsi_information_list);
OpenAPI_snssai_free(allowed_snssai->mapped_home_snssai);
ogs_free(allowed_snssai);
}
cJSON *OpenAPI_allowed_snssai_convertToJSON(OpenAPI_allowed_snssai_t *allowed_snssai)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (allowed_snssai == NULL) {
ogs_error("OpenAPI_allowed_snssai_convertToJSON() failed [AllowedSnssai]");
@ -45,6 +56,10 @@ cJSON *OpenAPI_allowed_snssai_convertToJSON(OpenAPI_allowed_snssai_t *allowed_sn
}
item = cJSON_CreateObject();
if (!allowed_snssai->allowed_snssai) {
ogs_error("OpenAPI_allowed_snssai_convertToJSON() failed [allowed_snssai]");
return NULL;
}
cJSON *allowed_snssai_local_JSON = OpenAPI_snssai_convertToJSON(allowed_snssai->allowed_snssai);
if (allowed_snssai_local_JSON == NULL) {
ogs_error("OpenAPI_allowed_snssai_convertToJSON() failed [allowed_snssai]");
@ -62,17 +77,13 @@ cJSON *OpenAPI_allowed_snssai_convertToJSON(OpenAPI_allowed_snssai_t *allowed_sn
ogs_error("OpenAPI_allowed_snssai_convertToJSON() failed [nsi_information_list]");
goto end;
}
OpenAPI_lnode_t *nsi_information_list_node;
if (allowed_snssai->nsi_information_list) {
OpenAPI_list_for_each(allowed_snssai->nsi_information_list, nsi_information_list_node) {
cJSON *itemLocal = OpenAPI_nsi_information_convertToJSON(nsi_information_list_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_allowed_snssai_convertToJSON() failed [nsi_information_list]");
goto end;
}
cJSON_AddItemToArray(nsi_information_listList, itemLocal);
OpenAPI_list_for_each(allowed_snssai->nsi_information_list, node) {
cJSON *itemLocal = OpenAPI_nsi_information_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_allowed_snssai_convertToJSON() failed [nsi_information_list]");
goto end;
}
cJSON_AddItemToArray(nsi_information_listList, itemLocal);
}
}
@ -96,47 +107,46 @@ end:
OpenAPI_allowed_snssai_t *OpenAPI_allowed_snssai_parseFromJSON(cJSON *allowed_snssaiJSON)
{
OpenAPI_allowed_snssai_t *allowed_snssai_local_var = NULL;
cJSON *allowed_snssai = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "allowedSnssai");
OpenAPI_lnode_t *node = NULL;
cJSON *allowed_snssai = NULL;
OpenAPI_snssai_t *allowed_snssai_local_nonprim = NULL;
cJSON *nsi_information_list = NULL;
OpenAPI_list_t *nsi_information_listList = NULL;
cJSON *mapped_home_snssai = NULL;
OpenAPI_snssai_t *mapped_home_snssai_local_nonprim = NULL;
allowed_snssai = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "allowedSnssai");
if (!allowed_snssai) {
ogs_error("OpenAPI_allowed_snssai_parseFromJSON() failed [allowed_snssai]");
goto end;
}
OpenAPI_snssai_t *allowed_snssai_local_nonprim = NULL;
allowed_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(allowed_snssai);
cJSON *nsi_information_list = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "nsiInformationList");
OpenAPI_list_t *nsi_information_listList;
nsi_information_list = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "nsiInformationList");
if (nsi_information_list) {
cJSON *nsi_information_list_local_nonprimitive;
if (!cJSON_IsArray(nsi_information_list)){
ogs_error("OpenAPI_allowed_snssai_parseFromJSON() failed [nsi_information_list]");
goto end;
}
nsi_information_listList = OpenAPI_list_create();
cJSON_ArrayForEach(nsi_information_list_local_nonprimitive, nsi_information_list ) {
if (!cJSON_IsObject(nsi_information_list_local_nonprimitive)) {
cJSON *nsi_information_list_local = NULL;
if (!cJSON_IsArray(nsi_information_list)) {
ogs_error("OpenAPI_allowed_snssai_parseFromJSON() failed [nsi_information_list]");
goto end;
}
OpenAPI_nsi_information_t *nsi_information_listItem = OpenAPI_nsi_information_parseFromJSON(nsi_information_list_local_nonprimitive);
if (!nsi_information_listItem) {
ogs_error("No nsi_information_listItem");
OpenAPI_list_free(nsi_information_listList);
goto end;
nsi_information_listList = OpenAPI_list_create();
cJSON_ArrayForEach(nsi_information_list_local, nsi_information_list) {
if (!cJSON_IsObject(nsi_information_list_local)) {
ogs_error("OpenAPI_allowed_snssai_parseFromJSON() failed [nsi_information_list]");
goto end;
}
OpenAPI_nsi_information_t *nsi_information_listItem = OpenAPI_nsi_information_parseFromJSON(nsi_information_list_local);
if (!nsi_information_listItem) {
ogs_error("No nsi_information_listItem");
OpenAPI_list_free(nsi_information_listList);
goto end;
}
OpenAPI_list_add(nsi_information_listList, nsi_information_listItem);
}
OpenAPI_list_add(nsi_information_listList, nsi_information_listItem);
}
}
cJSON *mapped_home_snssai = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "mappedHomeSnssai");
OpenAPI_snssai_t *mapped_home_snssai_local_nonprim = NULL;
mapped_home_snssai = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "mappedHomeSnssai");
if (mapped_home_snssai) {
mapped_home_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(mapped_home_snssai);
}
@ -149,6 +159,21 @@ OpenAPI_allowed_snssai_t *OpenAPI_allowed_snssai_parseFromJSON(cJSON *allowed_sn
return allowed_snssai_local_var;
end:
if (allowed_snssai_local_nonprim) {
OpenAPI_snssai_free(allowed_snssai_local_nonprim);
allowed_snssai_local_nonprim = NULL;
}
if (nsi_information_listList) {
OpenAPI_list_for_each(nsi_information_listList, node) {
OpenAPI_nsi_information_free(node->data);
}
OpenAPI_list_free(nsi_information_listList);
nsi_information_listList = NULL;
}
if (mapped_home_snssai_local_nonprim) {
OpenAPI_snssai_free(mapped_home_snssai_local_nonprim);
mapped_home_snssai_local_nonprim = NULL;
}
return NULL;
}