[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,24 +20,32 @@ OpenAPI_complex_query_t *OpenAPI_complex_query_create(
void OpenAPI_complex_query_free(OpenAPI_complex_query_t *complex_query)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == complex_query) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_list_for_each(complex_query->cnf_units, node) {
OpenAPI_cnf_unit_free(node->data);
if (complex_query->cnf_units) {
OpenAPI_list_for_each(complex_query->cnf_units, node) {
OpenAPI_cnf_unit_free(node->data);
}
OpenAPI_list_free(complex_query->cnf_units);
complex_query->cnf_units = NULL;
}
OpenAPI_list_free(complex_query->cnf_units);
OpenAPI_list_for_each(complex_query->dnf_units, node) {
OpenAPI_dnf_unit_free(node->data);
if (complex_query->dnf_units) {
OpenAPI_list_for_each(complex_query->dnf_units, node) {
OpenAPI_dnf_unit_free(node->data);
}
OpenAPI_list_free(complex_query->dnf_units);
complex_query->dnf_units = NULL;
}
OpenAPI_list_free(complex_query->dnf_units);
ogs_free(complex_query);
}
cJSON *OpenAPI_complex_query_convertToJSON(OpenAPI_complex_query_t *complex_query)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (complex_query == NULL) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [ComplexQuery]");
@ -45,40 +53,40 @@ cJSON *OpenAPI_complex_query_convertToJSON(OpenAPI_complex_query_t *complex_quer
}
item = cJSON_CreateObject();
if (!complex_query->cnf_units) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [cnf_units]");
return NULL;
}
cJSON *cnf_unitsList = cJSON_AddArrayToObject(item, "cnfUnits");
if (cnf_unitsList == NULL) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [cnf_units]");
goto end;
}
OpenAPI_lnode_t *cnf_units_node;
if (complex_query->cnf_units) {
OpenAPI_list_for_each(complex_query->cnf_units, cnf_units_node) {
cJSON *itemLocal = OpenAPI_cnf_unit_convertToJSON(cnf_units_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [cnf_units]");
goto end;
}
cJSON_AddItemToArray(cnf_unitsList, itemLocal);
OpenAPI_list_for_each(complex_query->cnf_units, node) {
cJSON *itemLocal = OpenAPI_cnf_unit_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [cnf_units]");
goto end;
}
cJSON_AddItemToArray(cnf_unitsList, itemLocal);
}
if (!complex_query->dnf_units) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [dnf_units]");
return NULL;
}
cJSON *dnf_unitsList = cJSON_AddArrayToObject(item, "dnfUnits");
if (dnf_unitsList == NULL) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [dnf_units]");
goto end;
}
OpenAPI_lnode_t *dnf_units_node;
if (complex_query->dnf_units) {
OpenAPI_list_for_each(complex_query->dnf_units, dnf_units_node) {
cJSON *itemLocal = OpenAPI_dnf_unit_convertToJSON(dnf_units_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [dnf_units]");
goto end;
}
cJSON_AddItemToArray(dnf_unitsList, itemLocal);
OpenAPI_list_for_each(complex_query->dnf_units, node) {
cJSON *itemLocal = OpenAPI_dnf_unit_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_complex_query_convertToJSON() failed [dnf_units]");
goto end;
}
cJSON_AddItemToArray(dnf_unitsList, itemLocal);
}
end:
@ -88,68 +96,65 @@ end:
OpenAPI_complex_query_t *OpenAPI_complex_query_parseFromJSON(cJSON *complex_queryJSON)
{
OpenAPI_complex_query_t *complex_query_local_var = NULL;
cJSON *cnf_units = cJSON_GetObjectItemCaseSensitive(complex_queryJSON, "cnfUnits");
OpenAPI_lnode_t *node = NULL;
cJSON *cnf_units = NULL;
OpenAPI_list_t *cnf_unitsList = NULL;
cJSON *dnf_units = NULL;
OpenAPI_list_t *dnf_unitsList = NULL;
cnf_units = cJSON_GetObjectItemCaseSensitive(complex_queryJSON, "cnfUnits");
if (!cnf_units) {
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [cnf_units]");
goto end;
}
OpenAPI_list_t *cnf_unitsList;
cJSON *cnf_units_local_nonprimitive;
if (!cJSON_IsArray(cnf_units)){
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [cnf_units]");
goto end;
}
cnf_unitsList = OpenAPI_list_create();
cJSON_ArrayForEach(cnf_units_local_nonprimitive, cnf_units ) {
if (!cJSON_IsObject(cnf_units_local_nonprimitive)) {
cJSON *cnf_units_local = NULL;
if (!cJSON_IsArray(cnf_units)) {
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [cnf_units]");
goto end;
}
OpenAPI_cnf_unit_t *cnf_unitsItem = OpenAPI_cnf_unit_parseFromJSON(cnf_units_local_nonprimitive);
if (!cnf_unitsItem) {
ogs_error("No cnf_unitsItem");
OpenAPI_list_free(cnf_unitsList);
goto end;
cnf_unitsList = OpenAPI_list_create();
cJSON_ArrayForEach(cnf_units_local, cnf_units) {
if (!cJSON_IsObject(cnf_units_local)) {
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [cnf_units]");
goto end;
}
OpenAPI_cnf_unit_t *cnf_unitsItem = OpenAPI_cnf_unit_parseFromJSON(cnf_units_local);
if (!cnf_unitsItem) {
ogs_error("No cnf_unitsItem");
OpenAPI_list_free(cnf_unitsList);
goto end;
}
OpenAPI_list_add(cnf_unitsList, cnf_unitsItem);
}
OpenAPI_list_add(cnf_unitsList, cnf_unitsItem);
}
cJSON *dnf_units = cJSON_GetObjectItemCaseSensitive(complex_queryJSON, "dnfUnits");
dnf_units = cJSON_GetObjectItemCaseSensitive(complex_queryJSON, "dnfUnits");
if (!dnf_units) {
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [dnf_units]");
goto end;
}
OpenAPI_list_t *dnf_unitsList;
cJSON *dnf_units_local_nonprimitive;
if (!cJSON_IsArray(dnf_units)){
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [dnf_units]");
goto end;
}
dnf_unitsList = OpenAPI_list_create();
cJSON_ArrayForEach(dnf_units_local_nonprimitive, dnf_units ) {
if (!cJSON_IsObject(dnf_units_local_nonprimitive)) {
cJSON *dnf_units_local = NULL;
if (!cJSON_IsArray(dnf_units)) {
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [dnf_units]");
goto end;
}
OpenAPI_dnf_unit_t *dnf_unitsItem = OpenAPI_dnf_unit_parseFromJSON(dnf_units_local_nonprimitive);
if (!dnf_unitsItem) {
ogs_error("No dnf_unitsItem");
OpenAPI_list_free(dnf_unitsList);
goto end;
dnf_unitsList = OpenAPI_list_create();
cJSON_ArrayForEach(dnf_units_local, dnf_units) {
if (!cJSON_IsObject(dnf_units_local)) {
ogs_error("OpenAPI_complex_query_parseFromJSON() failed [dnf_units]");
goto end;
}
OpenAPI_dnf_unit_t *dnf_unitsItem = OpenAPI_dnf_unit_parseFromJSON(dnf_units_local);
if (!dnf_unitsItem) {
ogs_error("No dnf_unitsItem");
OpenAPI_list_free(dnf_unitsList);
goto end;
}
OpenAPI_list_add(dnf_unitsList, dnf_unitsItem);
}
OpenAPI_list_add(dnf_unitsList, dnf_unitsItem);
}
complex_query_local_var = OpenAPI_complex_query_create (
cnf_unitsList,
dnf_unitsList
@ -157,6 +162,20 @@ OpenAPI_complex_query_t *OpenAPI_complex_query_parseFromJSON(cJSON *complex_quer
return complex_query_local_var;
end:
if (cnf_unitsList) {
OpenAPI_list_for_each(cnf_unitsList, node) {
OpenAPI_cnf_unit_free(node->data);
}
OpenAPI_list_free(cnf_unitsList);
cnf_unitsList = NULL;
}
if (dnf_unitsList) {
OpenAPI_list_for_each(dnf_unitsList, node) {
OpenAPI_dnf_unit_free(node->data);
}
OpenAPI_list_free(dnf_unitsList);
dnf_unitsList = NULL;
}
return NULL;
}