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:
parent
ce668c556c
commit
969c116e77
1097 changed files with 266728 additions and 42047 deletions
|
|
@ -22,25 +22,36 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_create(
|
|||
|
||||
void OpenAPI_twif_info_free(OpenAPI_twif_info_t *twif_info)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == twif_info) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
OpenAPI_list_for_each(twif_info->ipv4_endpoint_addresses, node) {
|
||||
ogs_free(node->data);
|
||||
if (twif_info->ipv4_endpoint_addresses) {
|
||||
OpenAPI_list_for_each(twif_info->ipv4_endpoint_addresses, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(twif_info->ipv4_endpoint_addresses);
|
||||
twif_info->ipv4_endpoint_addresses = NULL;
|
||||
}
|
||||
OpenAPI_list_free(twif_info->ipv4_endpoint_addresses);
|
||||
OpenAPI_list_for_each(twif_info->ipv6_endpoint_addresses, node) {
|
||||
ogs_free(node->data);
|
||||
if (twif_info->ipv6_endpoint_addresses) {
|
||||
OpenAPI_list_for_each(twif_info->ipv6_endpoint_addresses, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(twif_info->ipv6_endpoint_addresses);
|
||||
twif_info->ipv6_endpoint_addresses = NULL;
|
||||
}
|
||||
if (twif_info->endpoint_fqdn) {
|
||||
ogs_free(twif_info->endpoint_fqdn);
|
||||
twif_info->endpoint_fqdn = NULL;
|
||||
}
|
||||
OpenAPI_list_free(twif_info->ipv6_endpoint_addresses);
|
||||
ogs_free(twif_info->endpoint_fqdn);
|
||||
ogs_free(twif_info);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_twif_info_convertToJSON(OpenAPI_twif_info_t *twif_info)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (twif_info == NULL) {
|
||||
ogs_error("OpenAPI_twif_info_convertToJSON() failed [TwifInfo]");
|
||||
|
|
@ -49,35 +60,31 @@ cJSON *OpenAPI_twif_info_convertToJSON(OpenAPI_twif_info_t *twif_info)
|
|||
|
||||
item = cJSON_CreateObject();
|
||||
if (twif_info->ipv4_endpoint_addresses) {
|
||||
cJSON *ipv4_endpoint_addresses = cJSON_AddArrayToObject(item, "ipv4EndpointAddresses");
|
||||
if (ipv4_endpoint_addresses == NULL) {
|
||||
cJSON *ipv4_endpoint_addressesList = cJSON_AddArrayToObject(item, "ipv4EndpointAddresses");
|
||||
if (ipv4_endpoint_addressesList == NULL) {
|
||||
ogs_error("OpenAPI_twif_info_convertToJSON() failed [ipv4_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *ipv4_endpoint_addresses_node;
|
||||
OpenAPI_list_for_each(twif_info->ipv4_endpoint_addresses, ipv4_endpoint_addresses_node) {
|
||||
if (cJSON_AddStringToObject(ipv4_endpoint_addresses, "", (char*)ipv4_endpoint_addresses_node->data) == NULL) {
|
||||
ogs_error("OpenAPI_twif_info_convertToJSON() failed [ipv4_endpoint_addresses]");
|
||||
goto end;
|
||||
OpenAPI_list_for_each(twif_info->ipv4_endpoint_addresses, node) {
|
||||
if (cJSON_AddStringToObject(ipv4_endpoint_addressesList, "", (char*)node->data) == NULL) {
|
||||
ogs_error("OpenAPI_twif_info_convertToJSON() failed [ipv4_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (twif_info->ipv6_endpoint_addresses) {
|
||||
cJSON *ipv6_endpoint_addresses = cJSON_AddArrayToObject(item, "ipv6EndpointAddresses");
|
||||
if (ipv6_endpoint_addresses == NULL) {
|
||||
cJSON *ipv6_endpoint_addressesList = cJSON_AddArrayToObject(item, "ipv6EndpointAddresses");
|
||||
if (ipv6_endpoint_addressesList == NULL) {
|
||||
ogs_error("OpenAPI_twif_info_convertToJSON() failed [ipv6_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *ipv6_endpoint_addresses_node;
|
||||
OpenAPI_list_for_each(twif_info->ipv6_endpoint_addresses, ipv6_endpoint_addresses_node) {
|
||||
if (cJSON_AddStringToObject(ipv6_endpoint_addresses, "", (char*)ipv6_endpoint_addresses_node->data) == NULL) {
|
||||
ogs_error("OpenAPI_twif_info_convertToJSON() failed [ipv6_endpoint_addresses]");
|
||||
goto end;
|
||||
OpenAPI_list_for_each(twif_info->ipv6_endpoint_addresses, node) {
|
||||
if (cJSON_AddStringToObject(ipv6_endpoint_addressesList, "", (char*)node->data) == NULL) {
|
||||
ogs_error("OpenAPI_twif_info_convertToJSON() failed [ipv6_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (twif_info->endpoint_fqdn) {
|
||||
|
|
@ -94,50 +101,57 @@ end:
|
|||
OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON)
|
||||
{
|
||||
OpenAPI_twif_info_t *twif_info_local_var = NULL;
|
||||
cJSON *ipv4_endpoint_addresses = cJSON_GetObjectItemCaseSensitive(twif_infoJSON, "ipv4EndpointAddresses");
|
||||
|
||||
OpenAPI_list_t *ipv4_endpoint_addressesList;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *ipv4_endpoint_addresses = NULL;
|
||||
OpenAPI_list_t *ipv4_endpoint_addressesList = NULL;
|
||||
cJSON *ipv6_endpoint_addresses = NULL;
|
||||
OpenAPI_list_t *ipv6_endpoint_addressesList = NULL;
|
||||
cJSON *endpoint_fqdn = NULL;
|
||||
ipv4_endpoint_addresses = cJSON_GetObjectItemCaseSensitive(twif_infoJSON, "ipv4EndpointAddresses");
|
||||
if (ipv4_endpoint_addresses) {
|
||||
cJSON *ipv4_endpoint_addresses_local;
|
||||
if (!cJSON_IsArray(ipv4_endpoint_addresses)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv4_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
ipv4_endpoint_addressesList = OpenAPI_list_create();
|
||||
cJSON *ipv4_endpoint_addresses_local = NULL;
|
||||
if (!cJSON_IsArray(ipv4_endpoint_addresses)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv4_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
cJSON_ArrayForEach(ipv4_endpoint_addresses_local, ipv4_endpoint_addresses) {
|
||||
if (!cJSON_IsString(ipv4_endpoint_addresses_local)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv4_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup(ipv4_endpoint_addresses_local->valuestring));
|
||||
}
|
||||
ipv4_endpoint_addressesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(ipv4_endpoint_addresses_local, ipv4_endpoint_addresses) {
|
||||
double *localDouble = NULL;
|
||||
int *localInt = NULL;
|
||||
if (!cJSON_IsString(ipv4_endpoint_addresses_local)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv4_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup(ipv4_endpoint_addresses_local->valuestring));
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *ipv6_endpoint_addresses = cJSON_GetObjectItemCaseSensitive(twif_infoJSON, "ipv6EndpointAddresses");
|
||||
|
||||
OpenAPI_list_t *ipv6_endpoint_addressesList;
|
||||
ipv6_endpoint_addresses = cJSON_GetObjectItemCaseSensitive(twif_infoJSON, "ipv6EndpointAddresses");
|
||||
if (ipv6_endpoint_addresses) {
|
||||
cJSON *ipv6_endpoint_addresses_local;
|
||||
if (!cJSON_IsArray(ipv6_endpoint_addresses)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv6_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
ipv6_endpoint_addressesList = OpenAPI_list_create();
|
||||
cJSON *ipv6_endpoint_addresses_local = NULL;
|
||||
if (!cJSON_IsArray(ipv6_endpoint_addresses)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv6_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
cJSON_ArrayForEach(ipv6_endpoint_addresses_local, ipv6_endpoint_addresses) {
|
||||
if (!cJSON_IsString(ipv6_endpoint_addresses_local)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv6_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup(ipv6_endpoint_addresses_local->valuestring));
|
||||
}
|
||||
ipv6_endpoint_addressesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(ipv6_endpoint_addresses_local, ipv6_endpoint_addresses) {
|
||||
double *localDouble = NULL;
|
||||
int *localInt = NULL;
|
||||
if (!cJSON_IsString(ipv6_endpoint_addresses_local)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv6_endpoint_addresses]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup(ipv6_endpoint_addresses_local->valuestring));
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *endpoint_fqdn = cJSON_GetObjectItemCaseSensitive(twif_infoJSON, "endpointFqdn");
|
||||
|
||||
endpoint_fqdn = cJSON_GetObjectItemCaseSensitive(twif_infoJSON, "endpointFqdn");
|
||||
if (endpoint_fqdn) {
|
||||
if (!cJSON_IsString(endpoint_fqdn)) {
|
||||
if (!cJSON_IsString(endpoint_fqdn) && !cJSON_IsNull(endpoint_fqdn)) {
|
||||
ogs_error("OpenAPI_twif_info_parseFromJSON() failed [endpoint_fqdn]");
|
||||
goto end;
|
||||
}
|
||||
|
|
@ -146,11 +160,25 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON)
|
|||
twif_info_local_var = OpenAPI_twif_info_create (
|
||||
ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL,
|
||||
ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL,
|
||||
endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL
|
||||
endpoint_fqdn && !cJSON_IsNull(endpoint_fqdn) ? ogs_strdup(endpoint_fqdn->valuestring) : NULL
|
||||
);
|
||||
|
||||
return twif_info_local_var;
|
||||
end:
|
||||
if (ipv4_endpoint_addressesList) {
|
||||
OpenAPI_list_for_each(ipv4_endpoint_addressesList, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(ipv4_endpoint_addressesList);
|
||||
ipv4_endpoint_addressesList = NULL;
|
||||
}
|
||||
if (ipv6_endpoint_addressesList) {
|
||||
OpenAPI_list_for_each(ipv6_endpoint_addressesList, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(ipv6_endpoint_addressesList);
|
||||
ipv6_endpoint_addressesList = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue