[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

@ -24,23 +24,37 @@ OpenAPI_location_info_t *OpenAPI_location_info_create(
void OpenAPI_location_info_free(OpenAPI_location_info_t *location_info)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == location_info) {
return;
}
OpenAPI_lnode_t *node;
ogs_free(location_info->supi);
ogs_free(location_info->gpsi);
OpenAPI_list_for_each(location_info->registration_location_info_list, node) {
OpenAPI_registration_location_info_free(node->data);
if (location_info->supi) {
ogs_free(location_info->supi);
location_info->supi = NULL;
}
if (location_info->gpsi) {
ogs_free(location_info->gpsi);
location_info->gpsi = NULL;
}
if (location_info->registration_location_info_list) {
OpenAPI_list_for_each(location_info->registration_location_info_list, node) {
OpenAPI_registration_location_info_free(node->data);
}
OpenAPI_list_free(location_info->registration_location_info_list);
location_info->registration_location_info_list = NULL;
}
if (location_info->supported_features) {
ogs_free(location_info->supported_features);
location_info->supported_features = NULL;
}
OpenAPI_list_free(location_info->registration_location_info_list);
ogs_free(location_info->supported_features);
ogs_free(location_info);
}
cJSON *OpenAPI_location_info_convertToJSON(OpenAPI_location_info_t *location_info)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (location_info == NULL) {
ogs_error("OpenAPI_location_info_convertToJSON() failed [LocationInfo]");
@ -62,22 +76,22 @@ cJSON *OpenAPI_location_info_convertToJSON(OpenAPI_location_info_t *location_inf
}
}
if (!location_info->registration_location_info_list) {
ogs_error("OpenAPI_location_info_convertToJSON() failed [registration_location_info_list]");
return NULL;
}
cJSON *registration_location_info_listList = cJSON_AddArrayToObject(item, "registrationLocationInfoList");
if (registration_location_info_listList == NULL) {
ogs_error("OpenAPI_location_info_convertToJSON() failed [registration_location_info_list]");
goto end;
}
OpenAPI_lnode_t *registration_location_info_list_node;
if (location_info->registration_location_info_list) {
OpenAPI_list_for_each(location_info->registration_location_info_list, registration_location_info_list_node) {
cJSON *itemLocal = OpenAPI_registration_location_info_convertToJSON(registration_location_info_list_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_location_info_convertToJSON() failed [registration_location_info_list]");
goto end;
}
cJSON_AddItemToArray(registration_location_info_listList, itemLocal);
OpenAPI_list_for_each(location_info->registration_location_info_list, node) {
cJSON *itemLocal = OpenAPI_registration_location_info_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_location_info_convertToJSON() failed [registration_location_info_list]");
goto end;
}
cJSON_AddItemToArray(registration_location_info_listList, itemLocal);
}
if (location_info->supported_features) {
@ -94,73 +108,79 @@ end:
OpenAPI_location_info_t *OpenAPI_location_info_parseFromJSON(cJSON *location_infoJSON)
{
OpenAPI_location_info_t *location_info_local_var = NULL;
cJSON *supi = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "supi");
OpenAPI_lnode_t *node = NULL;
cJSON *supi = NULL;
cJSON *gpsi = NULL;
cJSON *registration_location_info_list = NULL;
OpenAPI_list_t *registration_location_info_listList = NULL;
cJSON *supported_features = NULL;
supi = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "supi");
if (supi) {
if (!cJSON_IsString(supi)) {
if (!cJSON_IsString(supi) && !cJSON_IsNull(supi)) {
ogs_error("OpenAPI_location_info_parseFromJSON() failed [supi]");
goto end;
}
}
cJSON *gpsi = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "gpsi");
gpsi = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "gpsi");
if (gpsi) {
if (!cJSON_IsString(gpsi)) {
if (!cJSON_IsString(gpsi) && !cJSON_IsNull(gpsi)) {
ogs_error("OpenAPI_location_info_parseFromJSON() failed [gpsi]");
goto end;
}
}
cJSON *registration_location_info_list = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "registrationLocationInfoList");
registration_location_info_list = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "registrationLocationInfoList");
if (!registration_location_info_list) {
ogs_error("OpenAPI_location_info_parseFromJSON() failed [registration_location_info_list]");
goto end;
}
OpenAPI_list_t *registration_location_info_listList;
cJSON *registration_location_info_list_local_nonprimitive;
if (!cJSON_IsArray(registration_location_info_list)){
ogs_error("OpenAPI_location_info_parseFromJSON() failed [registration_location_info_list]");
goto end;
}
registration_location_info_listList = OpenAPI_list_create();
cJSON_ArrayForEach(registration_location_info_list_local_nonprimitive, registration_location_info_list ) {
if (!cJSON_IsObject(registration_location_info_list_local_nonprimitive)) {
cJSON *registration_location_info_list_local = NULL;
if (!cJSON_IsArray(registration_location_info_list)) {
ogs_error("OpenAPI_location_info_parseFromJSON() failed [registration_location_info_list]");
goto end;
}
OpenAPI_registration_location_info_t *registration_location_info_listItem = OpenAPI_registration_location_info_parseFromJSON(registration_location_info_list_local_nonprimitive);
if (!registration_location_info_listItem) {
ogs_error("No registration_location_info_listItem");
OpenAPI_list_free(registration_location_info_listList);
goto end;
registration_location_info_listList = OpenAPI_list_create();
cJSON_ArrayForEach(registration_location_info_list_local, registration_location_info_list) {
if (!cJSON_IsObject(registration_location_info_list_local)) {
ogs_error("OpenAPI_location_info_parseFromJSON() failed [registration_location_info_list]");
goto end;
}
OpenAPI_registration_location_info_t *registration_location_info_listItem = OpenAPI_registration_location_info_parseFromJSON(registration_location_info_list_local);
if (!registration_location_info_listItem) {
ogs_error("No registration_location_info_listItem");
OpenAPI_list_free(registration_location_info_listList);
goto end;
}
OpenAPI_list_add(registration_location_info_listList, registration_location_info_listItem);
}
OpenAPI_list_add(registration_location_info_listList, registration_location_info_listItem);
}
cJSON *supported_features = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "supportedFeatures");
supported_features = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "supportedFeatures");
if (supported_features) {
if (!cJSON_IsString(supported_features)) {
if (!cJSON_IsString(supported_features) && !cJSON_IsNull(supported_features)) {
ogs_error("OpenAPI_location_info_parseFromJSON() failed [supported_features]");
goto end;
}
}
location_info_local_var = OpenAPI_location_info_create (
supi ? ogs_strdup(supi->valuestring) : NULL,
gpsi ? ogs_strdup(gpsi->valuestring) : NULL,
supi && !cJSON_IsNull(supi) ? ogs_strdup(supi->valuestring) : NULL,
gpsi && !cJSON_IsNull(gpsi) ? ogs_strdup(gpsi->valuestring) : NULL,
registration_location_info_listList,
supported_features ? ogs_strdup(supported_features->valuestring) : NULL
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
);
return location_info_local_var;
end:
if (registration_location_info_listList) {
OpenAPI_list_for_each(registration_location_info_listList, node) {
OpenAPI_registration_location_info_free(node->data);
}
OpenAPI_list_free(registration_location_info_listList);
registration_location_info_listList = NULL;
}
return NULL;
}