[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

@ -42,19 +42,30 @@ OpenAPI_trigger_t *OpenAPI_trigger_create(
void OpenAPI_trigger_free(OpenAPI_trigger_t *trigger)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == trigger) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_trigger_type_free(trigger->trigger_type);
OpenAPI_trigger_category_free(trigger->trigger_category);
ogs_free(trigger->tariff_time_change);
if (trigger->trigger_type) {
OpenAPI_trigger_type_free(trigger->trigger_type);
trigger->trigger_type = NULL;
}
if (trigger->trigger_category) {
OpenAPI_trigger_category_free(trigger->trigger_category);
trigger->trigger_category = NULL;
}
if (trigger->tariff_time_change) {
ogs_free(trigger->tariff_time_change);
trigger->tariff_time_change = NULL;
}
ogs_free(trigger);
}
cJSON *OpenAPI_trigger_convertToJSON(OpenAPI_trigger_t *trigger)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (trigger == NULL) {
ogs_error("OpenAPI_trigger_convertToJSON() failed [Trigger]");
@ -62,6 +73,10 @@ cJSON *OpenAPI_trigger_convertToJSON(OpenAPI_trigger_t *trigger)
}
item = cJSON_CreateObject();
if (!trigger->trigger_type) {
ogs_error("OpenAPI_trigger_convertToJSON() failed [trigger_type]");
return NULL;
}
cJSON *trigger_type_local_JSON = OpenAPI_trigger_type_convertToJSON(trigger->trigger_type);
if (trigger_type_local_JSON == NULL) {
ogs_error("OpenAPI_trigger_convertToJSON() failed [trigger_type]");
@ -73,6 +88,10 @@ cJSON *OpenAPI_trigger_convertToJSON(OpenAPI_trigger_t *trigger)
goto end;
}
if (!trigger->trigger_category) {
ogs_error("OpenAPI_trigger_convertToJSON() failed [trigger_category]");
return NULL;
}
cJSON *trigger_category_local_JSON = OpenAPI_trigger_category_convertToJSON(trigger->trigger_category);
if (trigger_category_local_JSON == NULL) {
ogs_error("OpenAPI_trigger_convertToJSON() failed [trigger_category]");
@ -133,26 +152,32 @@ end:
OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON)
{
OpenAPI_trigger_t *trigger_local_var = NULL;
cJSON *trigger_type = cJSON_GetObjectItemCaseSensitive(triggerJSON, "triggerType");
OpenAPI_lnode_t *node = NULL;
cJSON *trigger_type = NULL;
OpenAPI_trigger_type_t *trigger_type_local_nonprim = NULL;
cJSON *trigger_category = NULL;
OpenAPI_trigger_category_t *trigger_category_local_nonprim = NULL;
cJSON *time_limit = NULL;
cJSON *volume_limit = NULL;
cJSON *volume_limit64 = NULL;
cJSON *event_limit = NULL;
cJSON *max_number_ofccc = NULL;
cJSON *tariff_time_change = NULL;
trigger_type = cJSON_GetObjectItemCaseSensitive(triggerJSON, "triggerType");
if (!trigger_type) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [trigger_type]");
goto end;
}
OpenAPI_trigger_type_t *trigger_type_local_nonprim = NULL;
trigger_type_local_nonprim = OpenAPI_trigger_type_parseFromJSON(trigger_type);
cJSON *trigger_category = cJSON_GetObjectItemCaseSensitive(triggerJSON, "triggerCategory");
trigger_category = cJSON_GetObjectItemCaseSensitive(triggerJSON, "triggerCategory");
if (!trigger_category) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [trigger_category]");
goto end;
}
OpenAPI_trigger_category_t *trigger_category_local_nonprim = NULL;
trigger_category_local_nonprim = OpenAPI_trigger_category_parseFromJSON(trigger_category);
cJSON *time_limit = cJSON_GetObjectItemCaseSensitive(triggerJSON, "timeLimit");
time_limit = cJSON_GetObjectItemCaseSensitive(triggerJSON, "timeLimit");
if (time_limit) {
if (!cJSON_IsNumber(time_limit)) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [time_limit]");
@ -160,8 +185,7 @@ OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON)
}
}
cJSON *volume_limit = cJSON_GetObjectItemCaseSensitive(triggerJSON, "volumeLimit");
volume_limit = cJSON_GetObjectItemCaseSensitive(triggerJSON, "volumeLimit");
if (volume_limit) {
if (!cJSON_IsNumber(volume_limit)) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [volume_limit]");
@ -169,8 +193,7 @@ OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON)
}
}
cJSON *volume_limit64 = cJSON_GetObjectItemCaseSensitive(triggerJSON, "volumeLimit64");
volume_limit64 = cJSON_GetObjectItemCaseSensitive(triggerJSON, "volumeLimit64");
if (volume_limit64) {
if (!cJSON_IsNumber(volume_limit64)) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [volume_limit64]");
@ -178,8 +201,7 @@ OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON)
}
}
cJSON *event_limit = cJSON_GetObjectItemCaseSensitive(triggerJSON, "eventLimit");
event_limit = cJSON_GetObjectItemCaseSensitive(triggerJSON, "eventLimit");
if (event_limit) {
if (!cJSON_IsNumber(event_limit)) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [event_limit]");
@ -187,8 +209,7 @@ OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON)
}
}
cJSON *max_number_ofccc = cJSON_GetObjectItemCaseSensitive(triggerJSON, "maxNumberOfccc");
max_number_ofccc = cJSON_GetObjectItemCaseSensitive(triggerJSON, "maxNumberOfccc");
if (max_number_ofccc) {
if (!cJSON_IsNumber(max_number_ofccc)) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [max_number_ofccc]");
@ -196,10 +217,9 @@ OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON)
}
}
cJSON *tariff_time_change = cJSON_GetObjectItemCaseSensitive(triggerJSON, "tariffTimeChange");
tariff_time_change = cJSON_GetObjectItemCaseSensitive(triggerJSON, "tariffTimeChange");
if (tariff_time_change) {
if (!cJSON_IsString(tariff_time_change)) {
if (!cJSON_IsString(tariff_time_change) && !cJSON_IsNull(tariff_time_change)) {
ogs_error("OpenAPI_trigger_parseFromJSON() failed [tariff_time_change]");
goto end;
}
@ -218,11 +238,19 @@ OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON)
event_limit ? event_limit->valuedouble : 0,
max_number_ofccc ? true : false,
max_number_ofccc ? max_number_ofccc->valuedouble : 0,
tariff_time_change ? ogs_strdup(tariff_time_change->valuestring) : NULL
tariff_time_change && !cJSON_IsNull(tariff_time_change) ? ogs_strdup(tariff_time_change->valuestring) : NULL
);
return trigger_local_var;
end:
if (trigger_type_local_nonprim) {
OpenAPI_trigger_type_free(trigger_type_local_nonprim);
trigger_type_local_nonprim = NULL;
}
if (trigger_category_local_nonprim) {
OpenAPI_trigger_category_free(trigger_category_local_nonprim);
trigger_category_local_nonprim = NULL;
}
return NULL;
}