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
|
|
@ -20,21 +20,29 @@ OpenAPI_plmn_route_selection_descriptor_t *OpenAPI_plmn_route_selection_descript
|
|||
|
||||
void OpenAPI_plmn_route_selection_descriptor_free(OpenAPI_plmn_route_selection_descriptor_t *plmn_route_selection_descriptor)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == plmn_route_selection_descriptor) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
OpenAPI_plmn_id_1_free(plmn_route_selection_descriptor->serving_plmn);
|
||||
OpenAPI_list_for_each(plmn_route_selection_descriptor->snssai_route_sel_descs, node) {
|
||||
OpenAPI_snssai_route_selection_descriptor_free(node->data);
|
||||
if (plmn_route_selection_descriptor->serving_plmn) {
|
||||
OpenAPI_plmn_id_1_free(plmn_route_selection_descriptor->serving_plmn);
|
||||
plmn_route_selection_descriptor->serving_plmn = NULL;
|
||||
}
|
||||
if (plmn_route_selection_descriptor->snssai_route_sel_descs) {
|
||||
OpenAPI_list_for_each(plmn_route_selection_descriptor->snssai_route_sel_descs, node) {
|
||||
OpenAPI_snssai_route_selection_descriptor_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(plmn_route_selection_descriptor->snssai_route_sel_descs);
|
||||
plmn_route_selection_descriptor->snssai_route_sel_descs = NULL;
|
||||
}
|
||||
OpenAPI_list_free(plmn_route_selection_descriptor->snssai_route_sel_descs);
|
||||
ogs_free(plmn_route_selection_descriptor);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_plmn_route_selection_descriptor_convertToJSON(OpenAPI_plmn_route_selection_descriptor_t *plmn_route_selection_descriptor)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (plmn_route_selection_descriptor == NULL) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_convertToJSON() failed [PlmnRouteSelectionDescriptor]");
|
||||
|
|
@ -42,6 +50,10 @@ cJSON *OpenAPI_plmn_route_selection_descriptor_convertToJSON(OpenAPI_plmn_route_
|
|||
}
|
||||
|
||||
item = cJSON_CreateObject();
|
||||
if (!plmn_route_selection_descriptor->serving_plmn) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_convertToJSON() failed [serving_plmn]");
|
||||
return NULL;
|
||||
}
|
||||
cJSON *serving_plmn_local_JSON = OpenAPI_plmn_id_1_convertToJSON(plmn_route_selection_descriptor->serving_plmn);
|
||||
if (serving_plmn_local_JSON == NULL) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_convertToJSON() failed [serving_plmn]");
|
||||
|
|
@ -59,17 +71,13 @@ cJSON *OpenAPI_plmn_route_selection_descriptor_convertToJSON(OpenAPI_plmn_route_
|
|||
ogs_error("OpenAPI_plmn_route_selection_descriptor_convertToJSON() failed [snssai_route_sel_descs]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *snssai_route_sel_descs_node;
|
||||
if (plmn_route_selection_descriptor->snssai_route_sel_descs) {
|
||||
OpenAPI_list_for_each(plmn_route_selection_descriptor->snssai_route_sel_descs, snssai_route_sel_descs_node) {
|
||||
cJSON *itemLocal = OpenAPI_snssai_route_selection_descriptor_convertToJSON(snssai_route_sel_descs_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_convertToJSON() failed [snssai_route_sel_descs]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(snssai_route_sel_descsList, itemLocal);
|
||||
OpenAPI_list_for_each(plmn_route_selection_descriptor->snssai_route_sel_descs, node) {
|
||||
cJSON *itemLocal = OpenAPI_snssai_route_selection_descriptor_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_convertToJSON() failed [snssai_route_sel_descs]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(snssai_route_sel_descsList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -80,42 +88,41 @@ end:
|
|||
OpenAPI_plmn_route_selection_descriptor_t *OpenAPI_plmn_route_selection_descriptor_parseFromJSON(cJSON *plmn_route_selection_descriptorJSON)
|
||||
{
|
||||
OpenAPI_plmn_route_selection_descriptor_t *plmn_route_selection_descriptor_local_var = NULL;
|
||||
cJSON *serving_plmn = cJSON_GetObjectItemCaseSensitive(plmn_route_selection_descriptorJSON, "servingPlmn");
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *serving_plmn = NULL;
|
||||
OpenAPI_plmn_id_1_t *serving_plmn_local_nonprim = NULL;
|
||||
cJSON *snssai_route_sel_descs = NULL;
|
||||
OpenAPI_list_t *snssai_route_sel_descsList = NULL;
|
||||
serving_plmn = cJSON_GetObjectItemCaseSensitive(plmn_route_selection_descriptorJSON, "servingPlmn");
|
||||
if (!serving_plmn) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_parseFromJSON() failed [serving_plmn]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_plmn_id_1_t *serving_plmn_local_nonprim = NULL;
|
||||
serving_plmn_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(serving_plmn);
|
||||
|
||||
cJSON *snssai_route_sel_descs = cJSON_GetObjectItemCaseSensitive(plmn_route_selection_descriptorJSON, "snssaiRouteSelDescs");
|
||||
|
||||
OpenAPI_list_t *snssai_route_sel_descsList;
|
||||
snssai_route_sel_descs = cJSON_GetObjectItemCaseSensitive(plmn_route_selection_descriptorJSON, "snssaiRouteSelDescs");
|
||||
if (snssai_route_sel_descs) {
|
||||
cJSON *snssai_route_sel_descs_local_nonprimitive;
|
||||
if (!cJSON_IsArray(snssai_route_sel_descs)){
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_parseFromJSON() failed [snssai_route_sel_descs]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
snssai_route_sel_descsList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(snssai_route_sel_descs_local_nonprimitive, snssai_route_sel_descs ) {
|
||||
if (!cJSON_IsObject(snssai_route_sel_descs_local_nonprimitive)) {
|
||||
cJSON *snssai_route_sel_descs_local = NULL;
|
||||
if (!cJSON_IsArray(snssai_route_sel_descs)) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_parseFromJSON() failed [snssai_route_sel_descs]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_snssai_route_selection_descriptor_t *snssai_route_sel_descsItem = OpenAPI_snssai_route_selection_descriptor_parseFromJSON(snssai_route_sel_descs_local_nonprimitive);
|
||||
|
||||
if (!snssai_route_sel_descsItem) {
|
||||
ogs_error("No snssai_route_sel_descsItem");
|
||||
OpenAPI_list_free(snssai_route_sel_descsList);
|
||||
goto end;
|
||||
snssai_route_sel_descsList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(snssai_route_sel_descs_local, snssai_route_sel_descs) {
|
||||
if (!cJSON_IsObject(snssai_route_sel_descs_local)) {
|
||||
ogs_error("OpenAPI_plmn_route_selection_descriptor_parseFromJSON() failed [snssai_route_sel_descs]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_snssai_route_selection_descriptor_t *snssai_route_sel_descsItem = OpenAPI_snssai_route_selection_descriptor_parseFromJSON(snssai_route_sel_descs_local);
|
||||
if (!snssai_route_sel_descsItem) {
|
||||
ogs_error("No snssai_route_sel_descsItem");
|
||||
OpenAPI_list_free(snssai_route_sel_descsList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(snssai_route_sel_descsList, snssai_route_sel_descsItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(snssai_route_sel_descsList, snssai_route_sel_descsItem);
|
||||
}
|
||||
}
|
||||
|
||||
plmn_route_selection_descriptor_local_var = OpenAPI_plmn_route_selection_descriptor_create (
|
||||
|
|
@ -125,6 +132,17 @@ OpenAPI_plmn_route_selection_descriptor_t *OpenAPI_plmn_route_selection_descript
|
|||
|
||||
return plmn_route_selection_descriptor_local_var;
|
||||
end:
|
||||
if (serving_plmn_local_nonprim) {
|
||||
OpenAPI_plmn_id_1_free(serving_plmn_local_nonprim);
|
||||
serving_plmn_local_nonprim = NULL;
|
||||
}
|
||||
if (snssai_route_sel_descsList) {
|
||||
OpenAPI_list_for_each(snssai_route_sel_descsList, node) {
|
||||
OpenAPI_snssai_route_selection_descriptor_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(snssai_route_sel_descsList);
|
||||
snssai_route_sel_descsList = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue