mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-04 22:30: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
|
|
@ -24,32 +24,46 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_create(
|
|||
|
||||
void OpenAPI_bsf_info_free(OpenAPI_bsf_info_t *bsf_info)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == bsf_info) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
OpenAPI_list_for_each(bsf_info->dnn_list, node) {
|
||||
ogs_free(node->data);
|
||||
if (bsf_info->dnn_list) {
|
||||
OpenAPI_list_for_each(bsf_info->dnn_list, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->dnn_list);
|
||||
bsf_info->dnn_list = NULL;
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->dnn_list);
|
||||
OpenAPI_list_for_each(bsf_info->ip_domain_list, node) {
|
||||
ogs_free(node->data);
|
||||
if (bsf_info->ip_domain_list) {
|
||||
OpenAPI_list_for_each(bsf_info->ip_domain_list, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->ip_domain_list);
|
||||
bsf_info->ip_domain_list = NULL;
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->ip_domain_list);
|
||||
OpenAPI_list_for_each(bsf_info->ipv4_address_ranges, node) {
|
||||
OpenAPI_ipv4_address_range_free(node->data);
|
||||
if (bsf_info->ipv4_address_ranges) {
|
||||
OpenAPI_list_for_each(bsf_info->ipv4_address_ranges, node) {
|
||||
OpenAPI_ipv4_address_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->ipv4_address_ranges);
|
||||
bsf_info->ipv4_address_ranges = NULL;
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->ipv4_address_ranges);
|
||||
OpenAPI_list_for_each(bsf_info->ipv6_prefix_ranges, node) {
|
||||
OpenAPI_ipv6_prefix_range_free(node->data);
|
||||
if (bsf_info->ipv6_prefix_ranges) {
|
||||
OpenAPI_list_for_each(bsf_info->ipv6_prefix_ranges, node) {
|
||||
OpenAPI_ipv6_prefix_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->ipv6_prefix_ranges);
|
||||
bsf_info->ipv6_prefix_ranges = NULL;
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->ipv6_prefix_ranges);
|
||||
ogs_free(bsf_info);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_bsf_info_convertToJSON(OpenAPI_bsf_info_t *bsf_info)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (bsf_info == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [BsfInfo]");
|
||||
|
|
@ -58,35 +72,31 @@ cJSON *OpenAPI_bsf_info_convertToJSON(OpenAPI_bsf_info_t *bsf_info)
|
|||
|
||||
item = cJSON_CreateObject();
|
||||
if (bsf_info->dnn_list) {
|
||||
cJSON *dnn_list = cJSON_AddArrayToObject(item, "dnnList");
|
||||
if (dnn_list == NULL) {
|
||||
cJSON *dnn_listList = cJSON_AddArrayToObject(item, "dnnList");
|
||||
if (dnn_listList == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *dnn_list_node;
|
||||
OpenAPI_list_for_each(bsf_info->dnn_list, dnn_list_node) {
|
||||
if (cJSON_AddStringToObject(dnn_list, "", (char*)dnn_list_node->data) == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
OpenAPI_list_for_each(bsf_info->dnn_list, node) {
|
||||
if (cJSON_AddStringToObject(dnn_listList, "", (char*)node->data) == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (bsf_info->ip_domain_list) {
|
||||
cJSON *ip_domain_list = cJSON_AddArrayToObject(item, "ipDomainList");
|
||||
if (ip_domain_list == NULL) {
|
||||
cJSON *ip_domain_listList = cJSON_AddArrayToObject(item, "ipDomainList");
|
||||
if (ip_domain_listList == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ip_domain_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *ip_domain_list_node;
|
||||
OpenAPI_list_for_each(bsf_info->ip_domain_list, ip_domain_list_node) {
|
||||
if (cJSON_AddStringToObject(ip_domain_list, "", (char*)ip_domain_list_node->data) == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ip_domain_list]");
|
||||
goto end;
|
||||
OpenAPI_list_for_each(bsf_info->ip_domain_list, node) {
|
||||
if (cJSON_AddStringToObject(ip_domain_listList, "", (char*)node->data) == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ip_domain_list]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (bsf_info->ipv4_address_ranges) {
|
||||
|
|
@ -95,17 +105,13 @@ cJSON *OpenAPI_bsf_info_convertToJSON(OpenAPI_bsf_info_t *bsf_info)
|
|||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ipv4_address_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *ipv4_address_ranges_node;
|
||||
if (bsf_info->ipv4_address_ranges) {
|
||||
OpenAPI_list_for_each(bsf_info->ipv4_address_ranges, ipv4_address_ranges_node) {
|
||||
cJSON *itemLocal = OpenAPI_ipv4_address_range_convertToJSON(ipv4_address_ranges_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ipv4_address_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(ipv4_address_rangesList, itemLocal);
|
||||
OpenAPI_list_for_each(bsf_info->ipv4_address_ranges, node) {
|
||||
cJSON *itemLocal = OpenAPI_ipv4_address_range_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ipv4_address_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(ipv4_address_rangesList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -115,17 +121,13 @@ cJSON *OpenAPI_bsf_info_convertToJSON(OpenAPI_bsf_info_t *bsf_info)
|
|||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ipv6_prefix_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *ipv6_prefix_ranges_node;
|
||||
if (bsf_info->ipv6_prefix_ranges) {
|
||||
OpenAPI_list_for_each(bsf_info->ipv6_prefix_ranges, ipv6_prefix_ranges_node) {
|
||||
cJSON *itemLocal = OpenAPI_ipv6_prefix_range_convertToJSON(ipv6_prefix_ranges_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ipv6_prefix_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(ipv6_prefix_rangesList, itemLocal);
|
||||
OpenAPI_list_for_each(bsf_info->ipv6_prefix_ranges, node) {
|
||||
cJSON *itemLocal = OpenAPI_ipv6_prefix_range_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [ipv6_prefix_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(ipv6_prefix_rangesList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -136,102 +138,105 @@ end:
|
|||
OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON)
|
||||
{
|
||||
OpenAPI_bsf_info_t *bsf_info_local_var = NULL;
|
||||
cJSON *dnn_list = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "dnnList");
|
||||
|
||||
OpenAPI_list_t *dnn_listList;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *dnn_list = NULL;
|
||||
OpenAPI_list_t *dnn_listList = NULL;
|
||||
cJSON *ip_domain_list = NULL;
|
||||
OpenAPI_list_t *ip_domain_listList = NULL;
|
||||
cJSON *ipv4_address_ranges = NULL;
|
||||
OpenAPI_list_t *ipv4_address_rangesList = NULL;
|
||||
cJSON *ipv6_prefix_ranges = NULL;
|
||||
OpenAPI_list_t *ipv6_prefix_rangesList = NULL;
|
||||
dnn_list = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "dnnList");
|
||||
if (dnn_list) {
|
||||
cJSON *dnn_list_local;
|
||||
if (!cJSON_IsArray(dnn_list)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
dnn_listList = OpenAPI_list_create();
|
||||
cJSON *dnn_list_local = NULL;
|
||||
if (!cJSON_IsArray(dnn_list)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
cJSON_ArrayForEach(dnn_list_local, dnn_list) {
|
||||
if (!cJSON_IsString(dnn_list_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(dnn_listList, ogs_strdup(dnn_list_local->valuestring));
|
||||
}
|
||||
dnn_listList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(dnn_list_local, dnn_list) {
|
||||
double *localDouble = NULL;
|
||||
int *localInt = NULL;
|
||||
if (!cJSON_IsString(dnn_list_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(dnn_listList, ogs_strdup(dnn_list_local->valuestring));
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *ip_domain_list = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "ipDomainList");
|
||||
|
||||
OpenAPI_list_t *ip_domain_listList;
|
||||
ip_domain_list = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "ipDomainList");
|
||||
if (ip_domain_list) {
|
||||
cJSON *ip_domain_list_local;
|
||||
if (!cJSON_IsArray(ip_domain_list)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ip_domain_list]");
|
||||
goto end;
|
||||
}
|
||||
ip_domain_listList = OpenAPI_list_create();
|
||||
cJSON *ip_domain_list_local = NULL;
|
||||
if (!cJSON_IsArray(ip_domain_list)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ip_domain_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
cJSON_ArrayForEach(ip_domain_list_local, ip_domain_list) {
|
||||
if (!cJSON_IsString(ip_domain_list_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ip_domain_list]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ip_domain_listList, ogs_strdup(ip_domain_list_local->valuestring));
|
||||
}
|
||||
ip_domain_listList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(ip_domain_list_local, ip_domain_list) {
|
||||
double *localDouble = NULL;
|
||||
int *localInt = NULL;
|
||||
if (!cJSON_IsString(ip_domain_list_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ip_domain_list]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ip_domain_listList, ogs_strdup(ip_domain_list_local->valuestring));
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *ipv4_address_ranges = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "ipv4AddressRanges");
|
||||
|
||||
OpenAPI_list_t *ipv4_address_rangesList;
|
||||
ipv4_address_ranges = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "ipv4AddressRanges");
|
||||
if (ipv4_address_ranges) {
|
||||
cJSON *ipv4_address_ranges_local_nonprimitive;
|
||||
if (!cJSON_IsArray(ipv4_address_ranges)){
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ipv4_address_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
ipv4_address_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(ipv4_address_ranges_local_nonprimitive, ipv4_address_ranges ) {
|
||||
if (!cJSON_IsObject(ipv4_address_ranges_local_nonprimitive)) {
|
||||
cJSON *ipv4_address_ranges_local = NULL;
|
||||
if (!cJSON_IsArray(ipv4_address_ranges)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ipv4_address_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_ipv4_address_range_t *ipv4_address_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(ipv4_address_ranges_local_nonprimitive);
|
||||
|
||||
if (!ipv4_address_rangesItem) {
|
||||
ogs_error("No ipv4_address_rangesItem");
|
||||
OpenAPI_list_free(ipv4_address_rangesList);
|
||||
goto end;
|
||||
ipv4_address_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(ipv4_address_ranges_local, ipv4_address_ranges) {
|
||||
if (!cJSON_IsObject(ipv4_address_ranges_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ipv4_address_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_ipv4_address_range_t *ipv4_address_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(ipv4_address_ranges_local);
|
||||
if (!ipv4_address_rangesItem) {
|
||||
ogs_error("No ipv4_address_rangesItem");
|
||||
OpenAPI_list_free(ipv4_address_rangesList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ipv4_address_rangesList, ipv4_address_rangesItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(ipv4_address_rangesList, ipv4_address_rangesItem);
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *ipv6_prefix_ranges = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "ipv6PrefixRanges");
|
||||
|
||||
OpenAPI_list_t *ipv6_prefix_rangesList;
|
||||
ipv6_prefix_ranges = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "ipv6PrefixRanges");
|
||||
if (ipv6_prefix_ranges) {
|
||||
cJSON *ipv6_prefix_ranges_local_nonprimitive;
|
||||
if (!cJSON_IsArray(ipv6_prefix_ranges)){
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ipv6_prefix_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
ipv6_prefix_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(ipv6_prefix_ranges_local_nonprimitive, ipv6_prefix_ranges ) {
|
||||
if (!cJSON_IsObject(ipv6_prefix_ranges_local_nonprimitive)) {
|
||||
cJSON *ipv6_prefix_ranges_local = NULL;
|
||||
if (!cJSON_IsArray(ipv6_prefix_ranges)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ipv6_prefix_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_ipv6_prefix_range_t *ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(ipv6_prefix_ranges_local_nonprimitive);
|
||||
|
||||
if (!ipv6_prefix_rangesItem) {
|
||||
ogs_error("No ipv6_prefix_rangesItem");
|
||||
OpenAPI_list_free(ipv6_prefix_rangesList);
|
||||
goto end;
|
||||
ipv6_prefix_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(ipv6_prefix_ranges_local, ipv6_prefix_ranges) {
|
||||
if (!cJSON_IsObject(ipv6_prefix_ranges_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ipv6_prefix_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_ipv6_prefix_range_t *ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(ipv6_prefix_ranges_local);
|
||||
if (!ipv6_prefix_rangesItem) {
|
||||
ogs_error("No ipv6_prefix_rangesItem");
|
||||
OpenAPI_list_free(ipv6_prefix_rangesList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(ipv6_prefix_rangesList, ipv6_prefix_rangesItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(ipv6_prefix_rangesList, ipv6_prefix_rangesItem);
|
||||
}
|
||||
}
|
||||
|
||||
bsf_info_local_var = OpenAPI_bsf_info_create (
|
||||
|
|
@ -243,6 +248,34 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON)
|
|||
|
||||
return bsf_info_local_var;
|
||||
end:
|
||||
if (dnn_listList) {
|
||||
OpenAPI_list_for_each(dnn_listList, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(dnn_listList);
|
||||
dnn_listList = NULL;
|
||||
}
|
||||
if (ip_domain_listList) {
|
||||
OpenAPI_list_for_each(ip_domain_listList, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(ip_domain_listList);
|
||||
ip_domain_listList = NULL;
|
||||
}
|
||||
if (ipv4_address_rangesList) {
|
||||
OpenAPI_list_for_each(ipv4_address_rangesList, node) {
|
||||
OpenAPI_ipv4_address_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(ipv4_address_rangesList);
|
||||
ipv4_address_rangesList = NULL;
|
||||
}
|
||||
if (ipv6_prefix_rangesList) {
|
||||
OpenAPI_list_for_each(ipv6_prefix_rangesList, node) {
|
||||
OpenAPI_ipv6_prefix_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(ipv6_prefix_rangesList);
|
||||
ipv6_prefix_rangesList = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue