mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-02 13:20:08 +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
|
|
@ -22,28 +22,39 @@ OpenAPI_ue_context_in_smf_data_t *OpenAPI_ue_context_in_smf_data_create(
|
|||
|
||||
void OpenAPI_ue_context_in_smf_data_free(OpenAPI_ue_context_in_smf_data_t *ue_context_in_smf_data)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == ue_context_in_smf_data) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pdu_sessions, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
|
||||
ogs_free(localKeyValue->key);
|
||||
OpenAPI_pdu_session_free(localKeyValue->value);
|
||||
ogs_free(localKeyValue);
|
||||
if (ue_context_in_smf_data->pdu_sessions) {
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pdu_sessions, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
|
||||
ogs_free(localKeyValue->key);
|
||||
OpenAPI_pdu_session_free(localKeyValue->value);
|
||||
OpenAPI_map_free(localKeyValue);
|
||||
}
|
||||
OpenAPI_list_free(ue_context_in_smf_data->pdu_sessions);
|
||||
ue_context_in_smf_data->pdu_sessions = NULL;
|
||||
}
|
||||
OpenAPI_list_free(ue_context_in_smf_data->pdu_sessions);
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pgw_info, node) {
|
||||
OpenAPI_pgw_info_free(node->data);
|
||||
if (ue_context_in_smf_data->pgw_info) {
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pgw_info, node) {
|
||||
OpenAPI_pgw_info_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(ue_context_in_smf_data->pgw_info);
|
||||
ue_context_in_smf_data->pgw_info = NULL;
|
||||
}
|
||||
if (ue_context_in_smf_data->emergency_info) {
|
||||
OpenAPI_emergency_info_free(ue_context_in_smf_data->emergency_info);
|
||||
ue_context_in_smf_data->emergency_info = NULL;
|
||||
}
|
||||
OpenAPI_list_free(ue_context_in_smf_data->pgw_info);
|
||||
OpenAPI_emergency_info_free(ue_context_in_smf_data->emergency_info);
|
||||
ogs_free(ue_context_in_smf_data);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_ue_context_in_smf_data_convertToJSON(OpenAPI_ue_context_in_smf_data_t *ue_context_in_smf_data)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (ue_context_in_smf_data == NULL) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_convertToJSON() failed [UeContextInSmfData]");
|
||||
|
|
@ -58,21 +69,20 @@ cJSON *OpenAPI_ue_context_in_smf_data_convertToJSON(OpenAPI_ue_context_in_smf_da
|
|||
goto end;
|
||||
}
|
||||
cJSON *localMapObject = pdu_sessions;
|
||||
OpenAPI_lnode_t *pdu_sessions_node;
|
||||
if (ue_context_in_smf_data->pdu_sessions) {
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pdu_sessions, pdu_sessions_node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)pdu_sessions_node->data;
|
||||
cJSON *itemLocal = localKeyValue->value ?
|
||||
OpenAPI_pdu_session_convertToJSON(localKeyValue->value) :
|
||||
cJSON_CreateNull();
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_convertToJSON() failed [inner]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pdu_sessions, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
|
||||
cJSON *itemLocal = localKeyValue->value ?
|
||||
OpenAPI_pdu_session_convertToJSON(localKeyValue->value) :
|
||||
cJSON_CreateNull();
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_convertToJSON() failed [inner]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ue_context_in_smf_data->pgw_info) {
|
||||
cJSON *pgw_infoList = cJSON_AddArrayToObject(item, "pgwInfo");
|
||||
|
|
@ -80,17 +90,13 @@ cJSON *OpenAPI_ue_context_in_smf_data_convertToJSON(OpenAPI_ue_context_in_smf_da
|
|||
ogs_error("OpenAPI_ue_context_in_smf_data_convertToJSON() failed [pgw_info]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *pgw_info_node;
|
||||
if (ue_context_in_smf_data->pgw_info) {
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pgw_info, pgw_info_node) {
|
||||
cJSON *itemLocal = OpenAPI_pgw_info_convertToJSON(pgw_info_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_convertToJSON() failed [pgw_info]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(pgw_infoList, itemLocal);
|
||||
OpenAPI_list_for_each(ue_context_in_smf_data->pgw_info, node) {
|
||||
cJSON *itemLocal = OpenAPI_pgw_info_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_convertToJSON() failed [pgw_info]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(pgw_infoList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -114,64 +120,65 @@ end:
|
|||
OpenAPI_ue_context_in_smf_data_t *OpenAPI_ue_context_in_smf_data_parseFromJSON(cJSON *ue_context_in_smf_dataJSON)
|
||||
{
|
||||
OpenAPI_ue_context_in_smf_data_t *ue_context_in_smf_data_local_var = NULL;
|
||||
cJSON *pdu_sessions = cJSON_GetObjectItemCaseSensitive(ue_context_in_smf_dataJSON, "pduSessions");
|
||||
|
||||
OpenAPI_list_t *pdu_sessionsList;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *pdu_sessions = NULL;
|
||||
OpenAPI_list_t *pdu_sessionsList = NULL;
|
||||
cJSON *pgw_info = NULL;
|
||||
OpenAPI_list_t *pgw_infoList = NULL;
|
||||
cJSON *emergency_info = NULL;
|
||||
OpenAPI_emergency_info_t *emergency_info_local_nonprim = NULL;
|
||||
pdu_sessions = cJSON_GetObjectItemCaseSensitive(ue_context_in_smf_dataJSON, "pduSessions");
|
||||
if (pdu_sessions) {
|
||||
cJSON *pdu_sessions_local_map;
|
||||
if (!cJSON_IsObject(pdu_sessions)) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [pdu_sessions]");
|
||||
goto end;
|
||||
}
|
||||
pdu_sessionsList = OpenAPI_list_create();
|
||||
OpenAPI_map_t *localMapKeyPair = NULL;
|
||||
cJSON_ArrayForEach(pdu_sessions_local_map, pdu_sessions) {
|
||||
cJSON *localMapObject = pdu_sessions_local_map;
|
||||
if (cJSON_IsObject(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(
|
||||
ogs_strdup(localMapObject->string), OpenAPI_pdu_session_parseFromJSON(localMapObject));
|
||||
} else if (cJSON_IsNull(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
|
||||
} else {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [inner]");
|
||||
cJSON *pdu_sessions_local_map = NULL;
|
||||
if (!cJSON_IsObject(pdu_sessions) && !cJSON_IsNull(pdu_sessions)) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [pdu_sessions]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(pdu_sessionsList, localMapKeyPair);
|
||||
}
|
||||
if (cJSON_IsObject(pdu_sessions)) {
|
||||
pdu_sessionsList = OpenAPI_list_create();
|
||||
OpenAPI_map_t *localMapKeyPair = NULL;
|
||||
cJSON_ArrayForEach(pdu_sessions_local_map, pdu_sessions) {
|
||||
cJSON *localMapObject = pdu_sessions_local_map;
|
||||
if (cJSON_IsObject(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(
|
||||
ogs_strdup(localMapObject->string), OpenAPI_pdu_session_parseFromJSON(localMapObject));
|
||||
} else if (cJSON_IsNull(localMapObject)) {
|
||||
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
|
||||
} else {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [inner]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(pdu_sessionsList, localMapKeyPair);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *pgw_info = cJSON_GetObjectItemCaseSensitive(ue_context_in_smf_dataJSON, "pgwInfo");
|
||||
|
||||
OpenAPI_list_t *pgw_infoList;
|
||||
pgw_info = cJSON_GetObjectItemCaseSensitive(ue_context_in_smf_dataJSON, "pgwInfo");
|
||||
if (pgw_info) {
|
||||
cJSON *pgw_info_local_nonprimitive;
|
||||
if (!cJSON_IsArray(pgw_info)){
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [pgw_info]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
pgw_infoList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(pgw_info_local_nonprimitive, pgw_info ) {
|
||||
if (!cJSON_IsObject(pgw_info_local_nonprimitive)) {
|
||||
cJSON *pgw_info_local = NULL;
|
||||
if (!cJSON_IsArray(pgw_info)) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [pgw_info]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_pgw_info_t *pgw_infoItem = OpenAPI_pgw_info_parseFromJSON(pgw_info_local_nonprimitive);
|
||||
|
||||
if (!pgw_infoItem) {
|
||||
ogs_error("No pgw_infoItem");
|
||||
OpenAPI_list_free(pgw_infoList);
|
||||
goto end;
|
||||
pgw_infoList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(pgw_info_local, pgw_info) {
|
||||
if (!cJSON_IsObject(pgw_info_local)) {
|
||||
ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [pgw_info]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_pgw_info_t *pgw_infoItem = OpenAPI_pgw_info_parseFromJSON(pgw_info_local);
|
||||
if (!pgw_infoItem) {
|
||||
ogs_error("No pgw_infoItem");
|
||||
OpenAPI_list_free(pgw_infoList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(pgw_infoList, pgw_infoItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(pgw_infoList, pgw_infoItem);
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *emergency_info = cJSON_GetObjectItemCaseSensitive(ue_context_in_smf_dataJSON, "emergencyInfo");
|
||||
|
||||
OpenAPI_emergency_info_t *emergency_info_local_nonprim = NULL;
|
||||
emergency_info = cJSON_GetObjectItemCaseSensitive(ue_context_in_smf_dataJSON, "emergencyInfo");
|
||||
if (emergency_info) {
|
||||
emergency_info_local_nonprim = OpenAPI_emergency_info_parseFromJSON(emergency_info);
|
||||
}
|
||||
|
|
@ -184,6 +191,27 @@ OpenAPI_ue_context_in_smf_data_t *OpenAPI_ue_context_in_smf_data_parseFromJSON(c
|
|||
|
||||
return ue_context_in_smf_data_local_var;
|
||||
end:
|
||||
if (pdu_sessionsList) {
|
||||
OpenAPI_list_for_each(pdu_sessionsList, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*) node->data;
|
||||
ogs_free(localKeyValue->key);
|
||||
OpenAPI_pdu_session_free(localKeyValue->value);
|
||||
OpenAPI_map_free(localKeyValue);
|
||||
}
|
||||
OpenAPI_list_free(pdu_sessionsList);
|
||||
pdu_sessionsList = NULL;
|
||||
}
|
||||
if (pgw_infoList) {
|
||||
OpenAPI_list_for_each(pgw_infoList, node) {
|
||||
OpenAPI_pgw_info_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(pgw_infoList);
|
||||
pgw_infoList = NULL;
|
||||
}
|
||||
if (emergency_info_local_nonprim) {
|
||||
OpenAPI_emergency_info_free(emergency_info_local_nonprim);
|
||||
emergency_info_local_nonprim = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue