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
|
|
@ -32,31 +32,51 @@ OpenAPI_pcf_info_t *OpenAPI_pcf_info_create(
|
|||
|
||||
void OpenAPI_pcf_info_free(OpenAPI_pcf_info_t *pcf_info)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == pcf_info) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
ogs_free(pcf_info->group_id);
|
||||
OpenAPI_list_for_each(pcf_info->dnn_list, node) {
|
||||
ogs_free(node->data);
|
||||
if (pcf_info->group_id) {
|
||||
ogs_free(pcf_info->group_id);
|
||||
pcf_info->group_id = NULL;
|
||||
}
|
||||
OpenAPI_list_free(pcf_info->dnn_list);
|
||||
OpenAPI_list_for_each(pcf_info->supi_ranges, node) {
|
||||
OpenAPI_supi_range_free(node->data);
|
||||
if (pcf_info->dnn_list) {
|
||||
OpenAPI_list_for_each(pcf_info->dnn_list, node) {
|
||||
ogs_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(pcf_info->dnn_list);
|
||||
pcf_info->dnn_list = NULL;
|
||||
}
|
||||
OpenAPI_list_free(pcf_info->supi_ranges);
|
||||
OpenAPI_list_for_each(pcf_info->gpsi_ranges, node) {
|
||||
OpenAPI_identity_range_free(node->data);
|
||||
if (pcf_info->supi_ranges) {
|
||||
OpenAPI_list_for_each(pcf_info->supi_ranges, node) {
|
||||
OpenAPI_supi_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(pcf_info->supi_ranges);
|
||||
pcf_info->supi_ranges = NULL;
|
||||
}
|
||||
if (pcf_info->gpsi_ranges) {
|
||||
OpenAPI_list_for_each(pcf_info->gpsi_ranges, node) {
|
||||
OpenAPI_identity_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(pcf_info->gpsi_ranges);
|
||||
pcf_info->gpsi_ranges = NULL;
|
||||
}
|
||||
if (pcf_info->rx_diam_host) {
|
||||
ogs_free(pcf_info->rx_diam_host);
|
||||
pcf_info->rx_diam_host = NULL;
|
||||
}
|
||||
if (pcf_info->rx_diam_realm) {
|
||||
ogs_free(pcf_info->rx_diam_realm);
|
||||
pcf_info->rx_diam_realm = NULL;
|
||||
}
|
||||
OpenAPI_list_free(pcf_info->gpsi_ranges);
|
||||
ogs_free(pcf_info->rx_diam_host);
|
||||
ogs_free(pcf_info->rx_diam_realm);
|
||||
ogs_free(pcf_info);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_pcf_info_convertToJSON(OpenAPI_pcf_info_t *pcf_info)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (pcf_info == NULL) {
|
||||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [PcfInfo]");
|
||||
|
|
@ -72,19 +92,17 @@ cJSON *OpenAPI_pcf_info_convertToJSON(OpenAPI_pcf_info_t *pcf_info)
|
|||
}
|
||||
|
||||
if (pcf_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_pcf_info_convertToJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *dnn_list_node;
|
||||
OpenAPI_list_for_each(pcf_info->dnn_list, dnn_list_node) {
|
||||
if (cJSON_AddStringToObject(dnn_list, "", (char*)dnn_list_node->data) == NULL) {
|
||||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
OpenAPI_list_for_each(pcf_info->dnn_list, node) {
|
||||
if (cJSON_AddStringToObject(dnn_listList, "", (char*)node->data) == NULL) {
|
||||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pcf_info->supi_ranges) {
|
||||
|
|
@ -93,17 +111,13 @@ cJSON *OpenAPI_pcf_info_convertToJSON(OpenAPI_pcf_info_t *pcf_info)
|
|||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *supi_ranges_node;
|
||||
if (pcf_info->supi_ranges) {
|
||||
OpenAPI_list_for_each(pcf_info->supi_ranges, supi_ranges_node) {
|
||||
cJSON *itemLocal = OpenAPI_supi_range_convertToJSON(supi_ranges_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(supi_rangesList, itemLocal);
|
||||
OpenAPI_list_for_each(pcf_info->supi_ranges, node) {
|
||||
cJSON *itemLocal = OpenAPI_supi_range_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(supi_rangesList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -113,17 +127,13 @@ cJSON *OpenAPI_pcf_info_convertToJSON(OpenAPI_pcf_info_t *pcf_info)
|
|||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *gpsi_ranges_node;
|
||||
if (pcf_info->gpsi_ranges) {
|
||||
OpenAPI_list_for_each(pcf_info->gpsi_ranges, gpsi_ranges_node) {
|
||||
cJSON *itemLocal = OpenAPI_identity_range_convertToJSON(gpsi_ranges_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(gpsi_rangesList, itemLocal);
|
||||
OpenAPI_list_for_each(pcf_info->gpsi_ranges, node) {
|
||||
cJSON *itemLocal = OpenAPI_identity_range_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_pcf_info_convertToJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(gpsi_rangesList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -155,113 +165,113 @@ end:
|
|||
OpenAPI_pcf_info_t *OpenAPI_pcf_info_parseFromJSON(cJSON *pcf_infoJSON)
|
||||
{
|
||||
OpenAPI_pcf_info_t *pcf_info_local_var = NULL;
|
||||
cJSON *group_id = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "groupId");
|
||||
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *group_id = NULL;
|
||||
cJSON *dnn_list = NULL;
|
||||
OpenAPI_list_t *dnn_listList = NULL;
|
||||
cJSON *supi_ranges = NULL;
|
||||
OpenAPI_list_t *supi_rangesList = NULL;
|
||||
cJSON *gpsi_ranges = NULL;
|
||||
OpenAPI_list_t *gpsi_rangesList = NULL;
|
||||
cJSON *rx_diam_host = NULL;
|
||||
cJSON *rx_diam_realm = NULL;
|
||||
cJSON *v2x_support_ind = NULL;
|
||||
group_id = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "groupId");
|
||||
if (group_id) {
|
||||
if (!cJSON_IsString(group_id)) {
|
||||
if (!cJSON_IsString(group_id) && !cJSON_IsNull(group_id)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [group_id]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *dnn_list = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "dnnList");
|
||||
|
||||
OpenAPI_list_t *dnn_listList;
|
||||
dnn_list = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "dnnList");
|
||||
if (dnn_list) {
|
||||
cJSON *dnn_list_local;
|
||||
if (!cJSON_IsArray(dnn_list)) {
|
||||
ogs_error("OpenAPI_pcf_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_pcf_info_parseFromJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
cJSON_ArrayForEach(dnn_list_local, dnn_list) {
|
||||
if (!cJSON_IsString(dnn_list_local)) {
|
||||
ogs_error("OpenAPI_pcf_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_pcf_info_parseFromJSON() failed [dnn_list]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(dnn_listList, ogs_strdup(dnn_list_local->valuestring));
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *supi_ranges = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "supiRanges");
|
||||
|
||||
OpenAPI_list_t *supi_rangesList;
|
||||
supi_ranges = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "supiRanges");
|
||||
if (supi_ranges) {
|
||||
cJSON *supi_ranges_local_nonprimitive;
|
||||
if (!cJSON_IsArray(supi_ranges)){
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
supi_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(supi_ranges_local_nonprimitive, supi_ranges ) {
|
||||
if (!cJSON_IsObject(supi_ranges_local_nonprimitive)) {
|
||||
cJSON *supi_ranges_local = NULL;
|
||||
if (!cJSON_IsArray(supi_ranges)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local_nonprimitive);
|
||||
|
||||
if (!supi_rangesItem) {
|
||||
ogs_error("No supi_rangesItem");
|
||||
OpenAPI_list_free(supi_rangesList);
|
||||
goto end;
|
||||
supi_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(supi_ranges_local, supi_ranges) {
|
||||
if (!cJSON_IsObject(supi_ranges_local)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local);
|
||||
if (!supi_rangesItem) {
|
||||
ogs_error("No supi_rangesItem");
|
||||
OpenAPI_list_free(supi_rangesList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(supi_rangesList, supi_rangesItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(supi_rangesList, supi_rangesItem);
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *gpsi_ranges = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "gpsiRanges");
|
||||
|
||||
OpenAPI_list_t *gpsi_rangesList;
|
||||
gpsi_ranges = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "gpsiRanges");
|
||||
if (gpsi_ranges) {
|
||||
cJSON *gpsi_ranges_local_nonprimitive;
|
||||
if (!cJSON_IsArray(gpsi_ranges)){
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
gpsi_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(gpsi_ranges_local_nonprimitive, gpsi_ranges ) {
|
||||
if (!cJSON_IsObject(gpsi_ranges_local_nonprimitive)) {
|
||||
cJSON *gpsi_ranges_local = NULL;
|
||||
if (!cJSON_IsArray(gpsi_ranges)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local_nonprimitive);
|
||||
|
||||
if (!gpsi_rangesItem) {
|
||||
ogs_error("No gpsi_rangesItem");
|
||||
OpenAPI_list_free(gpsi_rangesList);
|
||||
goto end;
|
||||
gpsi_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(gpsi_ranges_local, gpsi_ranges) {
|
||||
if (!cJSON_IsObject(gpsi_ranges_local)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local);
|
||||
if (!gpsi_rangesItem) {
|
||||
ogs_error("No gpsi_rangesItem");
|
||||
OpenAPI_list_free(gpsi_rangesList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem);
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *rx_diam_host = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "rxDiamHost");
|
||||
|
||||
rx_diam_host = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "rxDiamHost");
|
||||
if (rx_diam_host) {
|
||||
if (!cJSON_IsString(rx_diam_host)) {
|
||||
if (!cJSON_IsString(rx_diam_host) && !cJSON_IsNull(rx_diam_host)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [rx_diam_host]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *rx_diam_realm = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "rxDiamRealm");
|
||||
|
||||
rx_diam_realm = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "rxDiamRealm");
|
||||
if (rx_diam_realm) {
|
||||
if (!cJSON_IsString(rx_diam_realm)) {
|
||||
if (!cJSON_IsString(rx_diam_realm) && !cJSON_IsNull(rx_diam_realm)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [rx_diam_realm]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *v2x_support_ind = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "v2xSupportInd");
|
||||
|
||||
v2x_support_ind = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "v2xSupportInd");
|
||||
if (v2x_support_ind) {
|
||||
if (!cJSON_IsBool(v2x_support_ind)) {
|
||||
ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [v2x_support_ind]");
|
||||
|
|
@ -270,18 +280,39 @@ OpenAPI_pcf_info_t *OpenAPI_pcf_info_parseFromJSON(cJSON *pcf_infoJSON)
|
|||
}
|
||||
|
||||
pcf_info_local_var = OpenAPI_pcf_info_create (
|
||||
group_id ? ogs_strdup(group_id->valuestring) : NULL,
|
||||
group_id && !cJSON_IsNull(group_id) ? ogs_strdup(group_id->valuestring) : NULL,
|
||||
dnn_list ? dnn_listList : NULL,
|
||||
supi_ranges ? supi_rangesList : NULL,
|
||||
gpsi_ranges ? gpsi_rangesList : NULL,
|
||||
rx_diam_host ? ogs_strdup(rx_diam_host->valuestring) : NULL,
|
||||
rx_diam_realm ? ogs_strdup(rx_diam_realm->valuestring) : NULL,
|
||||
rx_diam_host && !cJSON_IsNull(rx_diam_host) ? ogs_strdup(rx_diam_host->valuestring) : NULL,
|
||||
rx_diam_realm && !cJSON_IsNull(rx_diam_realm) ? ogs_strdup(rx_diam_realm->valuestring) : NULL,
|
||||
v2x_support_ind ? true : false,
|
||||
v2x_support_ind ? v2x_support_ind->valueint : 0
|
||||
);
|
||||
|
||||
return pcf_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 (supi_rangesList) {
|
||||
OpenAPI_list_for_each(supi_rangesList, node) {
|
||||
OpenAPI_supi_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(supi_rangesList);
|
||||
supi_rangesList = NULL;
|
||||
}
|
||||
if (gpsi_rangesList) {
|
||||
OpenAPI_list_for_each(gpsi_rangesList, node) {
|
||||
OpenAPI_identity_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(gpsi_rangesList);
|
||||
gpsi_rangesList = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue