mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-04 14:20:09 +00:00
[SBI] Crash occurs when ENUM in the MAP (#2103)
This commit is contained in:
Sukchan Lee
parent
ce668c556c
commit
969c116e77
1097 changed files with 266728 additions and 42047 deletions
|
|
@ -26,33 +26,50 @@ OpenAPI_nssai_t *OpenAPI_nssai_create(
|
|||
|
||||
void OpenAPI_nssai_free(OpenAPI_nssai_t *nssai)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == nssai) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
ogs_free(nssai->supported_features);
|
||||
OpenAPI_list_for_each(nssai->default_single_nssais, node) {
|
||||
OpenAPI_snssai_free(node->data);
|
||||
if (nssai->supported_features) {
|
||||
ogs_free(nssai->supported_features);
|
||||
nssai->supported_features = NULL;
|
||||
}
|
||||
OpenAPI_list_free(nssai->default_single_nssais);
|
||||
OpenAPI_list_for_each(nssai->single_nssais, node) {
|
||||
OpenAPI_snssai_free(node->data);
|
||||
if (nssai->default_single_nssais) {
|
||||
OpenAPI_list_for_each(nssai->default_single_nssais, node) {
|
||||
OpenAPI_snssai_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(nssai->default_single_nssais);
|
||||
nssai->default_single_nssais = NULL;
|
||||
}
|
||||
OpenAPI_list_free(nssai->single_nssais);
|
||||
ogs_free(nssai->provisioning_time);
|
||||
OpenAPI_list_for_each(nssai->additional_snssai_data, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
|
||||
ogs_free(localKeyValue->key);
|
||||
OpenAPI_additional_snssai_data_free(localKeyValue->value);
|
||||
ogs_free(localKeyValue);
|
||||
if (nssai->single_nssais) {
|
||||
OpenAPI_list_for_each(nssai->single_nssais, node) {
|
||||
OpenAPI_snssai_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(nssai->single_nssais);
|
||||
nssai->single_nssais = NULL;
|
||||
}
|
||||
if (nssai->provisioning_time) {
|
||||
ogs_free(nssai->provisioning_time);
|
||||
nssai->provisioning_time = NULL;
|
||||
}
|
||||
if (nssai->additional_snssai_data) {
|
||||
OpenAPI_list_for_each(nssai->additional_snssai_data, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
|
||||
ogs_free(localKeyValue->key);
|
||||
OpenAPI_additional_snssai_data_free(localKeyValue->value);
|
||||
OpenAPI_map_free(localKeyValue);
|
||||
}
|
||||
OpenAPI_list_free(nssai->additional_snssai_data);
|
||||
nssai->additional_snssai_data = NULL;
|
||||
}
|
||||
OpenAPI_list_free(nssai->additional_snssai_data);
|
||||
ogs_free(nssai);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_nssai_convertToJSON(OpenAPI_nssai_t *nssai)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (nssai == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [Nssai]");
|
||||
|
|
@ -67,22 +84,22 @@ cJSON *OpenAPI_nssai_convertToJSON(OpenAPI_nssai_t *nssai)
|
|||
}
|
||||
}
|
||||
|
||||
if (!nssai->default_single_nssais) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [default_single_nssais]");
|
||||
return NULL;
|
||||
}
|
||||
cJSON *default_single_nssaisList = cJSON_AddArrayToObject(item, "defaultSingleNssais");
|
||||
if (default_single_nssaisList == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [default_single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *default_single_nssais_node;
|
||||
if (nssai->default_single_nssais) {
|
||||
OpenAPI_list_for_each(nssai->default_single_nssais, default_single_nssais_node) {
|
||||
cJSON *itemLocal = OpenAPI_snssai_convertToJSON(default_single_nssais_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [default_single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(default_single_nssaisList, itemLocal);
|
||||
OpenAPI_list_for_each(nssai->default_single_nssais, node) {
|
||||
cJSON *itemLocal = OpenAPI_snssai_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [default_single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(default_single_nssaisList, itemLocal);
|
||||
}
|
||||
|
||||
if (nssai->single_nssais) {
|
||||
|
|
@ -91,17 +108,13 @@ cJSON *OpenAPI_nssai_convertToJSON(OpenAPI_nssai_t *nssai)
|
|||
ogs_error("OpenAPI_nssai_convertToJSON() failed [single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *single_nssais_node;
|
||||
if (nssai->single_nssais) {
|
||||
OpenAPI_list_for_each(nssai->single_nssais, single_nssais_node) {
|
||||
cJSON *itemLocal = OpenAPI_snssai_convertToJSON(single_nssais_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(single_nssaisList, itemLocal);
|
||||
OpenAPI_list_for_each(nssai->single_nssais, node) {
|
||||
cJSON *itemLocal = OpenAPI_snssai_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(single_nssaisList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -119,21 +132,20 @@ cJSON *OpenAPI_nssai_convertToJSON(OpenAPI_nssai_t *nssai)
|
|||
goto end;
|
||||
}
|
||||
cJSON *localMapObject = additional_snssai_data;
|
||||
OpenAPI_lnode_t *additional_snssai_data_node;
|
||||
if (nssai->additional_snssai_data) {
|
||||
OpenAPI_list_for_each(nssai->additional_snssai_data, additional_snssai_data_node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)additional_snssai_data_node->data;
|
||||
cJSON *itemLocal = localKeyValue->value ?
|
||||
OpenAPI_additional_snssai_data_convertToJSON(localKeyValue->value) :
|
||||
cJSON_CreateNull();
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [inner]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
|
||||
OpenAPI_list_for_each(nssai->additional_snssai_data, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
|
||||
cJSON *itemLocal = localKeyValue->value ?
|
||||
OpenAPI_additional_snssai_data_convertToJSON(localKeyValue->value) :
|
||||
cJSON_CreateNull();
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_nssai_convertToJSON() failed [inner]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
end:
|
||||
return item;
|
||||
|
|
@ -142,120 +154,143 @@ end:
|
|||
OpenAPI_nssai_t *OpenAPI_nssai_parseFromJSON(cJSON *nssaiJSON)
|
||||
{
|
||||
OpenAPI_nssai_t *nssai_local_var = NULL;
|
||||
cJSON *supported_features = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "supportedFeatures");
|
||||
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *supported_features = NULL;
|
||||
cJSON *default_single_nssais = NULL;
|
||||
OpenAPI_list_t *default_single_nssaisList = NULL;
|
||||
cJSON *single_nssais = NULL;
|
||||
OpenAPI_list_t *single_nssaisList = NULL;
|
||||
cJSON *provisioning_time = NULL;
|
||||
cJSON *additional_snssai_data = NULL;
|
||||
OpenAPI_list_t *additional_snssai_dataList = NULL;
|
||||
supported_features = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "supportedFeatures");
|
||||
if (supported_features) {
|
||||
if (!cJSON_IsString(supported_features)) {
|
||||
if (!cJSON_IsString(supported_features) && !cJSON_IsNull(supported_features)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [supported_features]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *default_single_nssais = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "defaultSingleNssais");
|
||||
default_single_nssais = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "defaultSingleNssais");
|
||||
if (!default_single_nssais) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [default_single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_list_t *default_single_nssaisList;
|
||||
cJSON *default_single_nssais_local_nonprimitive;
|
||||
if (!cJSON_IsArray(default_single_nssais)){
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [default_single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
default_single_nssaisList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(default_single_nssais_local_nonprimitive, default_single_nssais ) {
|
||||
if (!cJSON_IsObject(default_single_nssais_local_nonprimitive)) {
|
||||
cJSON *default_single_nssais_local = NULL;
|
||||
if (!cJSON_IsArray(default_single_nssais)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [default_single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_snssai_t *default_single_nssaisItem = OpenAPI_snssai_parseFromJSON(default_single_nssais_local_nonprimitive);
|
||||
|
||||
if (!default_single_nssaisItem) {
|
||||
ogs_error("No default_single_nssaisItem");
|
||||
OpenAPI_list_free(default_single_nssaisList);
|
||||
goto end;
|
||||
default_single_nssaisList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(default_single_nssais_local, default_single_nssais) {
|
||||
if (!cJSON_IsObject(default_single_nssais_local)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [default_single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_snssai_t *default_single_nssaisItem = OpenAPI_snssai_parseFromJSON(default_single_nssais_local);
|
||||
if (!default_single_nssaisItem) {
|
||||
ogs_error("No default_single_nssaisItem");
|
||||
OpenAPI_list_free(default_single_nssaisList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(default_single_nssaisList, default_single_nssaisItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(default_single_nssaisList, default_single_nssaisItem);
|
||||
}
|
||||
|
||||
cJSON *single_nssais = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "singleNssais");
|
||||
|
||||
OpenAPI_list_t *single_nssaisList;
|
||||
single_nssais = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "singleNssais");
|
||||
if (single_nssais) {
|
||||
cJSON *single_nssais_local_nonprimitive;
|
||||
if (!cJSON_IsArray(single_nssais)){
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
single_nssaisList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(single_nssais_local_nonprimitive, single_nssais ) {
|
||||
if (!cJSON_IsObject(single_nssais_local_nonprimitive)) {
|
||||
cJSON *single_nssais_local = NULL;
|
||||
if (!cJSON_IsArray(single_nssais)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_snssai_t *single_nssaisItem = OpenAPI_snssai_parseFromJSON(single_nssais_local_nonprimitive);
|
||||
|
||||
if (!single_nssaisItem) {
|
||||
ogs_error("No single_nssaisItem");
|
||||
OpenAPI_list_free(single_nssaisList);
|
||||
goto end;
|
||||
single_nssaisList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(single_nssais_local, single_nssais) {
|
||||
if (!cJSON_IsObject(single_nssais_local)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [single_nssais]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_snssai_t *single_nssaisItem = OpenAPI_snssai_parseFromJSON(single_nssais_local);
|
||||
if (!single_nssaisItem) {
|
||||
ogs_error("No single_nssaisItem");
|
||||
OpenAPI_list_free(single_nssaisList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(single_nssaisList, single_nssaisItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(single_nssaisList, single_nssaisItem);
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *provisioning_time = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "provisioningTime");
|
||||
|
||||
provisioning_time = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "provisioningTime");
|
||||
if (provisioning_time) {
|
||||
if (!cJSON_IsString(provisioning_time)) {
|
||||
if (!cJSON_IsString(provisioning_time) && !cJSON_IsNull(provisioning_time)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [provisioning_time]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *additional_snssai_data = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "additionalSnssaiData");
|
||||
|
||||
OpenAPI_list_t *additional_snssai_dataList;
|
||||
additional_snssai_data = cJSON_GetObjectItemCaseSensitive(nssaiJSON, "additionalSnssaiData");
|
||||
if (additional_snssai_data) {
|
||||
cJSON *additional_snssai_data_local_map;
|
||||
if (!cJSON_IsObject(additional_snssai_data)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [additional_snssai_data]");
|
||||
goto end;
|
||||
}
|
||||
additional_snssai_dataList = OpenAPI_list_create();
|
||||
OpenAPI_map_t *localMapKeyPair = NULL;
|
||||
cJSON_ArrayForEach(additional_snssai_data_local_map, additional_snssai_data) {
|
||||
cJSON *localMapObject = additional_snssai_data_local_map;
|
||||
if (cJSON_IsObject(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(
|
||||
ogs_strdup(localMapObject->string), OpenAPI_additional_snssai_data_parseFromJSON(localMapObject));
|
||||
} else if (cJSON_IsNull(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
|
||||
} else {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [inner]");
|
||||
cJSON *additional_snssai_data_local_map = NULL;
|
||||
if (!cJSON_IsObject(additional_snssai_data) && !cJSON_IsNull(additional_snssai_data)) {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [additional_snssai_data]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(additional_snssai_dataList, localMapKeyPair);
|
||||
}
|
||||
if (cJSON_IsObject(additional_snssai_data)) {
|
||||
additional_snssai_dataList = OpenAPI_list_create();
|
||||
OpenAPI_map_t *localMapKeyPair = NULL;
|
||||
cJSON_ArrayForEach(additional_snssai_data_local_map, additional_snssai_data) {
|
||||
cJSON *localMapObject = additional_snssai_data_local_map;
|
||||
if (cJSON_IsObject(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(
|
||||
ogs_strdup(localMapObject->string), OpenAPI_additional_snssai_data_parseFromJSON(localMapObject));
|
||||
} else if (cJSON_IsNull(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
|
||||
} else {
|
||||
ogs_error("OpenAPI_nssai_parseFromJSON() failed [inner]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(additional_snssai_dataList, localMapKeyPair);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nssai_local_var = OpenAPI_nssai_create (
|
||||
supported_features ? ogs_strdup(supported_features->valuestring) : NULL,
|
||||
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
|
||||
default_single_nssaisList,
|
||||
single_nssais ? single_nssaisList : NULL,
|
||||
provisioning_time ? ogs_strdup(provisioning_time->valuestring) : NULL,
|
||||
provisioning_time && !cJSON_IsNull(provisioning_time) ? ogs_strdup(provisioning_time->valuestring) : NULL,
|
||||
additional_snssai_data ? additional_snssai_dataList : NULL
|
||||
);
|
||||
|
||||
return nssai_local_var;
|
||||
end:
|
||||
if (default_single_nssaisList) {
|
||||
OpenAPI_list_for_each(default_single_nssaisList, node) {
|
||||
OpenAPI_snssai_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(default_single_nssaisList);
|
||||
default_single_nssaisList = NULL;
|
||||
}
|
||||
if (single_nssaisList) {
|
||||
OpenAPI_list_for_each(single_nssaisList, node) {
|
||||
OpenAPI_snssai_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(single_nssaisList);
|
||||
single_nssaisList = NULL;
|
||||
}
|
||||
if (additional_snssai_dataList) {
|
||||
OpenAPI_list_for_each(additional_snssai_dataList, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*) node->data;
|
||||
ogs_free(localKeyValue->key);
|
||||
OpenAPI_additional_snssai_data_free(localKeyValue->value);
|
||||
OpenAPI_map_free(localKeyValue);
|
||||
}
|
||||
OpenAPI_list_free(additional_snssai_dataList);
|
||||
additional_snssai_dataList = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue