vrr/open5gs
2
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2026-05-05 15:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[SBI] Crash occurs when ENUM in the MAP (#2103)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

47
lib/sbi/openapi/model/twap_id.c
View file

@ -7,7 +7,7 @@
OpenAPI_twap_id_t *OpenAPI_twap_id_create(
char *ss_id,
char *bss_id,
char civic_address
char *civic_address
)
{
OpenAPI_twap_id_t *twap_id_local_var = ogs_malloc(sizeof(OpenAPI_twap_id_t));
@ -22,18 +22,30 @@ OpenAPI_twap_id_t *OpenAPI_twap_id_create(
void OpenAPI_twap_id_free(OpenAPI_twap_id_t *twap_id)
{
OpenAPI_lnode_t *node = NULL;
if (NULL == twap_id) {
return;
}
OpenAPI_lnode_t *node;
ogs_free(twap_id->ss_id);
ogs_free(twap_id->bss_id);
if (twap_id->ss_id) {
ogs_free(twap_id->ss_id);
twap_id->ss_id = NULL;
}
if (twap_id->bss_id) {
ogs_free(twap_id->bss_id);
twap_id->bss_id = NULL;
}
if (twap_id->civic_address) {
ogs_free(twap_id->civic_address);
twap_id->civic_address = NULL;
}
ogs_free(twap_id);
}
cJSON *OpenAPI_twap_id_convertToJSON(OpenAPI_twap_id_t *twap_id)
{
cJSON *item = NULL;
OpenAPI_lnode_t *node = NULL;
if (twap_id == NULL) {
ogs_error("OpenAPI_twap_id_convertToJSON() failed [TwapId]");
@ -41,6 +53,10 @@ cJSON *OpenAPI_twap_id_convertToJSON(OpenAPI_twap_id_t *twap_id)
}
item = cJSON_CreateObject();
if (!twap_id->ss_id) {
ogs_error("OpenAPI_twap_id_convertToJSON() failed [ss_id]");
return NULL;
}
if (cJSON_AddStringToObject(item, "ssId", twap_id->ss_id) == NULL) {
ogs_error("OpenAPI_twap_id_convertToJSON() failed [ss_id]");
goto end;
@ -54,7 +70,7 @@ cJSON *OpenAPI_twap_id_convertToJSON(OpenAPI_twap_id_t *twap_id)
}
if (twap_id->civic_address) {
if (cJSON_AddNumberToObject(item, "civicAddress", twap_id->civic_address) == NULL) {
if (cJSON_AddStringToObject(item, "civicAddress", twap_id->civic_address) == NULL) {
ogs_error("OpenAPI_twap_id_convertToJSON() failed [civic_address]");
goto end;
}
@ -67,30 +83,31 @@ end:
OpenAPI_twap_id_t *OpenAPI_twap_id_parseFromJSON(cJSON *twap_idJSON)
{
OpenAPI_twap_id_t *twap_id_local_var = NULL;
cJSON *ss_id = cJSON_GetObjectItemCaseSensitive(twap_idJSON, "ssId");
OpenAPI_lnode_t *node = NULL;
cJSON *ss_id = NULL;
cJSON *bss_id = NULL;
cJSON *civic_address = NULL;
ss_id = cJSON_GetObjectItemCaseSensitive(twap_idJSON, "ssId");
if (!ss_id) {
ogs_error("OpenAPI_twap_id_parseFromJSON() failed [ss_id]");
goto end;
}
if (!cJSON_IsString(ss_id)) {
ogs_error("OpenAPI_twap_id_parseFromJSON() failed [ss_id]");
goto end;
}
cJSON *bss_id = cJSON_GetObjectItemCaseSensitive(twap_idJSON, "bssId");
bss_id = cJSON_GetObjectItemCaseSensitive(twap_idJSON, "bssId");
if (bss_id) {
if (!cJSON_IsString(bss_id)) {
if (!cJSON_IsString(bss_id) && !cJSON_IsNull(bss_id)) {
ogs_error("OpenAPI_twap_id_parseFromJSON() failed [bss_id]");
goto end;
}
}
cJSON *civic_address = cJSON_GetObjectItemCaseSensitive(twap_idJSON, "civicAddress");
civic_address = cJSON_GetObjectItemCaseSensitive(twap_idJSON, "civicAddress");
if (civic_address) {
if (!cJSON_IsNumber(civic_address)) {
if (!cJSON_IsString(civic_address) && !cJSON_IsNull(civic_address)) {
ogs_error("OpenAPI_twap_id_parseFromJSON() failed [civic_address]");
goto end;
}
@ -98,8 +115,8 @@ OpenAPI_twap_id_t *OpenAPI_twap_id_parseFromJSON(cJSON *twap_idJSON)
twap_id_local_var = OpenAPI_twap_id_create (
ogs_strdup(ss_id->valuestring),
bss_id ? ogs_strdup(bss_id->valuestring) : NULL,
civic_address ? civic_address->valueint : 0
bss_id && !cJSON_IsNull(bss_id) ? ogs_strdup(bss_id->valuestring) : NULL,
civic_address && !cJSON_IsNull(civic_address) ? ogs_strdup(civic_address->valuestring) : NULL
);
return twap_id_local_var;