mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-03 05:40: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
|
|
@ -24,22 +24,33 @@ OpenAPI_af_external_t *OpenAPI_af_external_create(
|
|||
|
||||
void OpenAPI_af_external_free(OpenAPI_af_external_t *af_external)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == af_external) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
ogs_free(af_external->af_id);
|
||||
OpenAPI_list_for_each(af_external->allowed_geographic_area, node) {
|
||||
OpenAPI_geographic_area_free(node->data);
|
||||
if (af_external->af_id) {
|
||||
ogs_free(af_external->af_id);
|
||||
af_external->af_id = NULL;
|
||||
}
|
||||
if (af_external->allowed_geographic_area) {
|
||||
OpenAPI_list_for_each(af_external->allowed_geographic_area, node) {
|
||||
OpenAPI_geographic_area_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(af_external->allowed_geographic_area);
|
||||
af_external->allowed_geographic_area = NULL;
|
||||
}
|
||||
if (af_external->valid_time_period) {
|
||||
OpenAPI_valid_time_period_free(af_external->valid_time_period);
|
||||
af_external->valid_time_period = NULL;
|
||||
}
|
||||
OpenAPI_list_free(af_external->allowed_geographic_area);
|
||||
OpenAPI_valid_time_period_free(af_external->valid_time_period);
|
||||
ogs_free(af_external);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_af_external_convertToJSON(OpenAPI_af_external_t *af_external)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (af_external == NULL) {
|
||||
ogs_error("OpenAPI_af_external_convertToJSON() failed [AfExternal]");
|
||||
|
|
@ -60,21 +71,17 @@ cJSON *OpenAPI_af_external_convertToJSON(OpenAPI_af_external_t *af_external)
|
|||
ogs_error("OpenAPI_af_external_convertToJSON() failed [allowed_geographic_area]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *allowed_geographic_area_node;
|
||||
if (af_external->allowed_geographic_area) {
|
||||
OpenAPI_list_for_each(af_external->allowed_geographic_area, allowed_geographic_area_node) {
|
||||
cJSON *itemLocal = OpenAPI_geographic_area_convertToJSON(allowed_geographic_area_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_af_external_convertToJSON() failed [allowed_geographic_area]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(allowed_geographic_areaList, itemLocal);
|
||||
OpenAPI_list_for_each(af_external->allowed_geographic_area, node) {
|
||||
cJSON *itemLocal = OpenAPI_geographic_area_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_af_external_convertToJSON() failed [allowed_geographic_area]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(allowed_geographic_areaList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
if (af_external->privacy_check_related_action) {
|
||||
if (af_external->privacy_check_related_action != OpenAPI_privacy_check_related_action_NULL) {
|
||||
if (cJSON_AddStringToObject(item, "privacyCheckRelatedAction", OpenAPI_privacy_check_related_action_ToString(af_external->privacy_check_related_action)) == NULL) {
|
||||
ogs_error("OpenAPI_af_external_convertToJSON() failed [privacy_check_related_action]");
|
||||
goto end;
|
||||
|
|
@ -101,47 +108,48 @@ end:
|
|||
OpenAPI_af_external_t *OpenAPI_af_external_parseFromJSON(cJSON *af_externalJSON)
|
||||
{
|
||||
OpenAPI_af_external_t *af_external_local_var = NULL;
|
||||
cJSON *af_id = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "afId");
|
||||
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *af_id = NULL;
|
||||
cJSON *allowed_geographic_area = NULL;
|
||||
OpenAPI_list_t *allowed_geographic_areaList = NULL;
|
||||
cJSON *privacy_check_related_action = NULL;
|
||||
OpenAPI_privacy_check_related_action_e privacy_check_related_actionVariable = 0;
|
||||
cJSON *valid_time_period = NULL;
|
||||
OpenAPI_valid_time_period_t *valid_time_period_local_nonprim = NULL;
|
||||
af_id = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "afId");
|
||||
if (af_id) {
|
||||
if (!cJSON_IsString(af_id)) {
|
||||
if (!cJSON_IsString(af_id) && !cJSON_IsNull(af_id)) {
|
||||
ogs_error("OpenAPI_af_external_parseFromJSON() failed [af_id]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *allowed_geographic_area = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "allowedGeographicArea");
|
||||
|
||||
OpenAPI_list_t *allowed_geographic_areaList;
|
||||
allowed_geographic_area = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "allowedGeographicArea");
|
||||
if (allowed_geographic_area) {
|
||||
cJSON *allowed_geographic_area_local_nonprimitive;
|
||||
if (!cJSON_IsArray(allowed_geographic_area)){
|
||||
ogs_error("OpenAPI_af_external_parseFromJSON() failed [allowed_geographic_area]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
allowed_geographic_areaList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(allowed_geographic_area_local_nonprimitive, allowed_geographic_area ) {
|
||||
if (!cJSON_IsObject(allowed_geographic_area_local_nonprimitive)) {
|
||||
cJSON *allowed_geographic_area_local = NULL;
|
||||
if (!cJSON_IsArray(allowed_geographic_area)) {
|
||||
ogs_error("OpenAPI_af_external_parseFromJSON() failed [allowed_geographic_area]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_geographic_area_t *allowed_geographic_areaItem = OpenAPI_geographic_area_parseFromJSON(allowed_geographic_area_local_nonprimitive);
|
||||
|
||||
if (!allowed_geographic_areaItem) {
|
||||
ogs_error("No allowed_geographic_areaItem");
|
||||
OpenAPI_list_free(allowed_geographic_areaList);
|
||||
goto end;
|
||||
allowed_geographic_areaList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(allowed_geographic_area_local, allowed_geographic_area) {
|
||||
if (!cJSON_IsObject(allowed_geographic_area_local)) {
|
||||
ogs_error("OpenAPI_af_external_parseFromJSON() failed [allowed_geographic_area]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_geographic_area_t *allowed_geographic_areaItem = OpenAPI_geographic_area_parseFromJSON(allowed_geographic_area_local);
|
||||
if (!allowed_geographic_areaItem) {
|
||||
ogs_error("No allowed_geographic_areaItem");
|
||||
OpenAPI_list_free(allowed_geographic_areaList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(allowed_geographic_areaList, allowed_geographic_areaItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(allowed_geographic_areaList, allowed_geographic_areaItem);
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *privacy_check_related_action = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "privacyCheckRelatedAction");
|
||||
|
||||
OpenAPI_privacy_check_related_action_e privacy_check_related_actionVariable;
|
||||
privacy_check_related_action = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "privacyCheckRelatedAction");
|
||||
if (privacy_check_related_action) {
|
||||
if (!cJSON_IsString(privacy_check_related_action)) {
|
||||
ogs_error("OpenAPI_af_external_parseFromJSON() failed [privacy_check_related_action]");
|
||||
|
|
@ -150,15 +158,13 @@ OpenAPI_af_external_t *OpenAPI_af_external_parseFromJSON(cJSON *af_externalJSON)
|
|||
privacy_check_related_actionVariable = OpenAPI_privacy_check_related_action_FromString(privacy_check_related_action->valuestring);
|
||||
}
|
||||
|
||||
cJSON *valid_time_period = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "validTimePeriod");
|
||||
|
||||
OpenAPI_valid_time_period_t *valid_time_period_local_nonprim = NULL;
|
||||
valid_time_period = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "validTimePeriod");
|
||||
if (valid_time_period) {
|
||||
valid_time_period_local_nonprim = OpenAPI_valid_time_period_parseFromJSON(valid_time_period);
|
||||
}
|
||||
|
||||
af_external_local_var = OpenAPI_af_external_create (
|
||||
af_id ? ogs_strdup(af_id->valuestring) : NULL,
|
||||
af_id && !cJSON_IsNull(af_id) ? ogs_strdup(af_id->valuestring) : NULL,
|
||||
allowed_geographic_area ? allowed_geographic_areaList : NULL,
|
||||
privacy_check_related_action ? privacy_check_related_actionVariable : 0,
|
||||
valid_time_period ? valid_time_period_local_nonprim : NULL
|
||||
|
|
@ -166,6 +172,17 @@ OpenAPI_af_external_t *OpenAPI_af_external_parseFromJSON(cJSON *af_externalJSON)
|
|||
|
||||
return af_external_local_var;
|
||||
end:
|
||||
if (allowed_geographic_areaList) {
|
||||
OpenAPI_list_for_each(allowed_geographic_areaList, node) {
|
||||
OpenAPI_geographic_area_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(allowed_geographic_areaList);
|
||||
allowed_geographic_areaList = NULL;
|
||||
}
|
||||
if (valid_time_period_local_nonprim) {
|
||||
OpenAPI_valid_time_period_free(valid_time_period_local_nonprim);
|
||||
valid_time_period_local_nonprim = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue