[SBI] Crash occurs when ENUM in the MAP (#2103)

This commit is contained in:
Sukchan Lee 2023-03-01 17:50:25 +09:00
parent ce668c556c
commit 969c116e77
1097 changed files with 266728 additions and 42047 deletions

View file

@ -20,21 +20,29 @@ OpenAPI_expected_ue_behavior_t *OpenAPI_expected_ue_behavior_create(
void OpenAPI_expected_ue_behavior_free(OpenAPI_expected_ue_behavior_t *expected_ue_behavior)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == expected_ue_behavior) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_list_for_each(expected_ue_behavior->exp_move_trajectory, node) {
OpenAPI_user_location_free(node->data);
if (expected_ue_behavior->exp_move_trajectory) {
OpenAPI_list_for_each(expected_ue_behavior->exp_move_trajectory, node) {
OpenAPI_user_location_free(node->data);
}
OpenAPI_list_free(expected_ue_behavior->exp_move_trajectory);
expected_ue_behavior->exp_move_trajectory = NULL;
}
if (expected_ue_behavior->validity_time) {
ogs_free(expected_ue_behavior->validity_time);
expected_ue_behavior->validity_time = NULL;
}
OpenAPI_list_free(expected_ue_behavior->exp_move_trajectory);
ogs_free(expected_ue_behavior->validity_time);
ogs_free(expected_ue_behavior);
}
cJSON *OpenAPI_expected_ue_behavior_convertToJSON(OpenAPI_expected_ue_behavior_t *expected_ue_behavior)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (expected_ue_behavior == NULL) {
ogs_error("OpenAPI_expected_ue_behavior_convertToJSON() failed [ExpectedUeBehavior]");
@ -42,24 +50,28 @@ cJSON *OpenAPI_expected_ue_behavior_convertToJSON(OpenAPI_expected_ue_behavior_t
}
item = cJSON_CreateObject();
if (!expected_ue_behavior->exp_move_trajectory) {
ogs_error("OpenAPI_expected_ue_behavior_convertToJSON() failed [exp_move_trajectory]");
return NULL;
}
cJSON *exp_move_trajectoryList = cJSON_AddArrayToObject(item, "expMoveTrajectory");
if (exp_move_trajectoryList == NULL) {
ogs_error("OpenAPI_expected_ue_behavior_convertToJSON() failed [exp_move_trajectory]");
goto end;
}
OpenAPI_lnode_t *exp_move_trajectory_node;
if (expected_ue_behavior->exp_move_trajectory) {
OpenAPI_list_for_each(expected_ue_behavior->exp_move_trajectory, exp_move_trajectory_node) {
cJSON *itemLocal = OpenAPI_user_location_convertToJSON(exp_move_trajectory_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_expected_ue_behavior_convertToJSON() failed [exp_move_trajectory]");
goto end;
}
cJSON_AddItemToArray(exp_move_trajectoryList, itemLocal);
OpenAPI_list_for_each(expected_ue_behavior->exp_move_trajectory, node) {
cJSON *itemLocal = OpenAPI_user_location_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_expected_ue_behavior_convertToJSON() failed [exp_move_trajectory]");
goto end;
}
cJSON_AddItemToArray(exp_move_trajectoryList, itemLocal);
}
if (!expected_ue_behavior->validity_time) {
ogs_error("OpenAPI_expected_ue_behavior_convertToJSON() failed [validity_time]");
return NULL;
}
if (cJSON_AddStringToObject(item, "validityTime", expected_ue_behavior->validity_time) == NULL) {
ogs_error("OpenAPI_expected_ue_behavior_convertToJSON() failed [validity_time]");
goto end;
@ -72,44 +84,43 @@ end:
OpenAPI_expected_ue_behavior_t *OpenAPI_expected_ue_behavior_parseFromJSON(cJSON *expected_ue_behaviorJSON)
{
OpenAPI_expected_ue_behavior_t *expected_ue_behavior_local_var = NULL;
cJSON *exp_move_trajectory = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviorJSON, "expMoveTrajectory");
OpenAPI_lnode_t *node = NULL;
cJSON *exp_move_trajectory = NULL;
OpenAPI_list_t *exp_move_trajectoryList = NULL;
cJSON *validity_time = NULL;
exp_move_trajectory = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviorJSON, "expMoveTrajectory");
if (!exp_move_trajectory) {
ogs_error("OpenAPI_expected_ue_behavior_parseFromJSON() failed [exp_move_trajectory]");
goto end;
}
OpenAPI_list_t *exp_move_trajectoryList;
cJSON *exp_move_trajectory_local_nonprimitive;
if (!cJSON_IsArray(exp_move_trajectory)){
ogs_error("OpenAPI_expected_ue_behavior_parseFromJSON() failed [exp_move_trajectory]");
goto end;
}
exp_move_trajectoryList = OpenAPI_list_create();
cJSON_ArrayForEach(exp_move_trajectory_local_nonprimitive, exp_move_trajectory ) {
if (!cJSON_IsObject(exp_move_trajectory_local_nonprimitive)) {
cJSON *exp_move_trajectory_local = NULL;
if (!cJSON_IsArray(exp_move_trajectory)) {
ogs_error("OpenAPI_expected_ue_behavior_parseFromJSON() failed [exp_move_trajectory]");
goto end;
}
OpenAPI_user_location_t *exp_move_trajectoryItem = OpenAPI_user_location_parseFromJSON(exp_move_trajectory_local_nonprimitive);
if (!exp_move_trajectoryItem) {
ogs_error("No exp_move_trajectoryItem");
OpenAPI_list_free(exp_move_trajectoryList);
goto end;
exp_move_trajectoryList = OpenAPI_list_create();
cJSON_ArrayForEach(exp_move_trajectory_local, exp_move_trajectory) {
if (!cJSON_IsObject(exp_move_trajectory_local)) {
ogs_error("OpenAPI_expected_ue_behavior_parseFromJSON() failed [exp_move_trajectory]");
goto end;
}
OpenAPI_user_location_t *exp_move_trajectoryItem = OpenAPI_user_location_parseFromJSON(exp_move_trajectory_local);
if (!exp_move_trajectoryItem) {
ogs_error("No exp_move_trajectoryItem");
OpenAPI_list_free(exp_move_trajectoryList);
goto end;
}
OpenAPI_list_add(exp_move_trajectoryList, exp_move_trajectoryItem);
}
OpenAPI_list_add(exp_move_trajectoryList, exp_move_trajectoryItem);
}
cJSON *validity_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviorJSON, "validityTime");
validity_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviorJSON, "validityTime");
if (!validity_time) {
ogs_error("OpenAPI_expected_ue_behavior_parseFromJSON() failed [validity_time]");
goto end;
}
if (!cJSON_IsString(validity_time)) {
if (!cJSON_IsString(validity_time) && !cJSON_IsNull(validity_time)) {
ogs_error("OpenAPI_expected_ue_behavior_parseFromJSON() failed [validity_time]");
goto end;
}
@ -121,6 +132,13 @@ OpenAPI_expected_ue_behavior_t *OpenAPI_expected_ue_behavior_parseFromJSON(cJSON
return expected_ue_behavior_local_var;
end:
if (exp_move_trajectoryList) {
OpenAPI_list_for_each(exp_move_trajectoryList, node) {
OpenAPI_user_location_free(node->data);
}
OpenAPI_list_free(exp_move_trajectoryList);
exp_move_trajectoryList = NULL;
}
return NULL;
}