[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_area_t *OpenAPI_area_create(
void OpenAPI_area_free(OpenAPI_area_t *area)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == area) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_list_for_each(area->tacs, node) {
ogs_free(node->data);
if (area->tacs) {
OpenAPI_list_for_each(area->tacs, node) {
ogs_free(node->data);
}
OpenAPI_list_free(area->tacs);
area->tacs = NULL;
}
if (area->area_code) {
ogs_free(area->area_code);
area->area_code = NULL;
}
OpenAPI_list_free(area->tacs);
ogs_free(area->area_code);
ogs_free(area);
}
cJSON *OpenAPI_area_convertToJSON(OpenAPI_area_t *area)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (area == NULL) {
ogs_error("OpenAPI_area_convertToJSON() failed [Area]");
@ -43,19 +51,17 @@ cJSON *OpenAPI_area_convertToJSON(OpenAPI_area_t *area)
item = cJSON_CreateObject();
if (area->tacs) {
cJSON *tacs = cJSON_AddArrayToObject(item, "tacs");
if (tacs == NULL) {
cJSON *tacsList = cJSON_AddArrayToObject(item, "tacs");
if (tacsList == NULL) {
ogs_error("OpenAPI_area_convertToJSON() failed [tacs]");
goto end;
}
OpenAPI_lnode_t *tacs_node;
OpenAPI_list_for_each(area->tacs, tacs_node) {
if (cJSON_AddStringToObject(tacs, "", (char*)tacs_node->data) == NULL) {
ogs_error("OpenAPI_area_convertToJSON() failed [tacs]");
goto end;
OpenAPI_list_for_each(area->tacs, node) {
if (cJSON_AddStringToObject(tacsList, "", (char*)node->data) == NULL) {
ogs_error("OpenAPI_area_convertToJSON() failed [tacs]");
goto end;
}
}
}
}
if (area->area_code) {
@ -72,30 +78,34 @@ end:
OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON)
{
OpenAPI_area_t *area_local_var = NULL;
cJSON *tacs = cJSON_GetObjectItemCaseSensitive(areaJSON, "tacs");
OpenAPI_list_t *tacsList;
OpenAPI_lnode_t *node = NULL;
cJSON *tacs = NULL;
OpenAPI_list_t *tacsList = NULL;
cJSON *area_code = NULL;
tacs = cJSON_GetObjectItemCaseSensitive(areaJSON, "tacs");
if (tacs) {
cJSON *tacs_local;
if (!cJSON_IsArray(tacs)) {
ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]");
goto end;
}
tacsList = OpenAPI_list_create();
cJSON *tacs_local = NULL;
if (!cJSON_IsArray(tacs)) {
ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]");
goto end;
}
cJSON_ArrayForEach(tacs_local, tacs) {
if (!cJSON_IsString(tacs_local)) {
ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]");
goto end;
}
OpenAPI_list_add(tacsList, ogs_strdup(tacs_local->valuestring));
}
tacsList = OpenAPI_list_create();
cJSON_ArrayForEach(tacs_local, tacs) {
double *localDouble = NULL;
int *localInt = NULL;
if (!cJSON_IsString(tacs_local)) {
ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]");
goto end;
}
OpenAPI_list_add(tacsList, ogs_strdup(tacs_local->valuestring));
}
}
cJSON *area_code = cJSON_GetObjectItemCaseSensitive(areaJSON, "areaCode");
area_code = cJSON_GetObjectItemCaseSensitive(areaJSON, "areaCode");
if (area_code) {
if (!cJSON_IsString(area_code)) {
if (!cJSON_IsString(area_code) && !cJSON_IsNull(area_code)) {
ogs_error("OpenAPI_area_parseFromJSON() failed [area_code]");
goto end;
}
@ -103,11 +113,18 @@ OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON)
area_local_var = OpenAPI_area_create (
tacs ? tacsList : NULL,
area_code ? ogs_strdup(area_code->valuestring) : NULL
area_code && !cJSON_IsNull(area_code) ? ogs_strdup(area_code->valuestring) : NULL
);
return area_local_var;
end:
if (tacsList) {
OpenAPI_list_for_each(tacsList, node) {
ogs_free(node->data);
}
OpenAPI_list_free(tacsList);
tacsList = NULL;
}
return NULL;
}