[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

@ -34,19 +34,30 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_create(
void OpenAPI_seaf_data_free(OpenAPI_seaf_data_t *seaf_data)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == seaf_data) {
return;
}
OpenAPI_lnode_t *node;
OpenAPI_ng_ksi_free(seaf_data->ng_ksi);
OpenAPI_key_amf_free(seaf_data->key_amf);
ogs_free(seaf_data->nh);
if (seaf_data->ng_ksi) {
OpenAPI_ng_ksi_free(seaf_data->ng_ksi);
seaf_data->ng_ksi = NULL;
}
if (seaf_data->key_amf) {
OpenAPI_key_amf_free(seaf_data->key_amf);
seaf_data->key_amf = NULL;
}
if (seaf_data->nh) {
ogs_free(seaf_data->nh);
seaf_data->nh = NULL;
}
ogs_free(seaf_data);
}
cJSON *OpenAPI_seaf_data_convertToJSON(OpenAPI_seaf_data_t *seaf_data)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (seaf_data == NULL) {
ogs_error("OpenAPI_seaf_data_convertToJSON() failed [SeafData]");
@ -54,6 +65,10 @@ cJSON *OpenAPI_seaf_data_convertToJSON(OpenAPI_seaf_data_t *seaf_data)
}
item = cJSON_CreateObject();
if (!seaf_data->ng_ksi) {
ogs_error("OpenAPI_seaf_data_convertToJSON() failed [ng_ksi]");
return NULL;
}
cJSON *ng_ksi_local_JSON = OpenAPI_ng_ksi_convertToJSON(seaf_data->ng_ksi);
if (ng_ksi_local_JSON == NULL) {
ogs_error("OpenAPI_seaf_data_convertToJSON() failed [ng_ksi]");
@ -65,6 +80,10 @@ cJSON *OpenAPI_seaf_data_convertToJSON(OpenAPI_seaf_data_t *seaf_data)
goto end;
}
if (!seaf_data->key_amf) {
ogs_error("OpenAPI_seaf_data_convertToJSON() failed [key_amf]");
return NULL;
}
cJSON *key_amf_local_JSON = OpenAPI_key_amf_convertToJSON(seaf_data->key_amf);
if (key_amf_local_JSON == NULL) {
ogs_error("OpenAPI_seaf_data_convertToJSON() failed [key_amf]");
@ -111,35 +130,38 @@ end:
OpenAPI_seaf_data_t *OpenAPI_seaf_data_parseFromJSON(cJSON *seaf_dataJSON)
{
OpenAPI_seaf_data_t *seaf_data_local_var = NULL;
cJSON *ng_ksi = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "ngKsi");
OpenAPI_lnode_t *node = NULL;
cJSON *ng_ksi = NULL;
OpenAPI_ng_ksi_t *ng_ksi_local_nonprim = NULL;
cJSON *key_amf = NULL;
OpenAPI_key_amf_t *key_amf_local_nonprim = NULL;
cJSON *nh = NULL;
cJSON *ncc = NULL;
cJSON *key_amf_change_ind = NULL;
cJSON *key_amf_h_derivation_ind = NULL;
ng_ksi = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "ngKsi");
if (!ng_ksi) {
ogs_error("OpenAPI_seaf_data_parseFromJSON() failed [ng_ksi]");
goto end;
}
OpenAPI_ng_ksi_t *ng_ksi_local_nonprim = NULL;
ng_ksi_local_nonprim = OpenAPI_ng_ksi_parseFromJSON(ng_ksi);
cJSON *key_amf = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "keyAmf");
key_amf = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "keyAmf");
if (!key_amf) {
ogs_error("OpenAPI_seaf_data_parseFromJSON() failed [key_amf]");
goto end;
}
OpenAPI_key_amf_t *key_amf_local_nonprim = NULL;
key_amf_local_nonprim = OpenAPI_key_amf_parseFromJSON(key_amf);
cJSON *nh = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "nh");
nh = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "nh");
if (nh) {
if (!cJSON_IsString(nh)) {
if (!cJSON_IsString(nh) && !cJSON_IsNull(nh)) {
ogs_error("OpenAPI_seaf_data_parseFromJSON() failed [nh]");
goto end;
}
}
cJSON *ncc = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "ncc");
ncc = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "ncc");
if (ncc) {
if (!cJSON_IsNumber(ncc)) {
ogs_error("OpenAPI_seaf_data_parseFromJSON() failed [ncc]");
@ -147,8 +169,7 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_parseFromJSON(cJSON *seaf_dataJSON)
}
}
cJSON *key_amf_change_ind = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "keyAmfChangeInd");
key_amf_change_ind = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "keyAmfChangeInd");
if (key_amf_change_ind) {
if (!cJSON_IsBool(key_amf_change_ind)) {
ogs_error("OpenAPI_seaf_data_parseFromJSON() failed [key_amf_change_ind]");
@ -156,8 +177,7 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_parseFromJSON(cJSON *seaf_dataJSON)
}
}
cJSON *key_amf_h_derivation_ind = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "keyAmfHDerivationInd");
key_amf_h_derivation_ind = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "keyAmfHDerivationInd");
if (key_amf_h_derivation_ind) {
if (!cJSON_IsBool(key_amf_h_derivation_ind)) {
ogs_error("OpenAPI_seaf_data_parseFromJSON() failed [key_amf_h_derivation_ind]");
@ -168,7 +188,7 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_parseFromJSON(cJSON *seaf_dataJSON)
seaf_data_local_var = OpenAPI_seaf_data_create (
ng_ksi_local_nonprim,
key_amf_local_nonprim,
nh ? ogs_strdup(nh->valuestring) : NULL,
nh && !cJSON_IsNull(nh) ? ogs_strdup(nh->valuestring) : NULL,
ncc ? true : false,
ncc ? ncc->valuedouble : 0,
key_amf_change_ind ? true : false,
@ -179,6 +199,14 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_parseFromJSON(cJSON *seaf_dataJSON)
return seaf_data_local_var;
end:
if (ng_ksi_local_nonprim) {
OpenAPI_ng_ksi_free(ng_ksi_local_nonprim);
ng_ksi_local_nonprim = NULL;
}
if (key_amf_local_nonprim) {
OpenAPI_key_amf_free(key_amf_local_nonprim);
key_amf_local_nonprim = NULL;
}
return NULL;
}