mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-04 14:20:09 +00:00
[SBI] Crash occurs when ENUM in the MAP (#2103)
This commit is contained in:
parent
ce668c556c
commit
969c116e77
1097 changed files with 266728 additions and 42047 deletions
|
|
@ -22,19 +22,30 @@ OpenAPI_user_identifier_t *OpenAPI_user_identifier_create(
|
|||
|
||||
void OpenAPI_user_identifier_free(OpenAPI_user_identifier_t *user_identifier)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == user_identifier) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
ogs_free(user_identifier->supi);
|
||||
ogs_free(user_identifier->gpsi);
|
||||
ogs_free(user_identifier->validity_time);
|
||||
if (user_identifier->supi) {
|
||||
ogs_free(user_identifier->supi);
|
||||
user_identifier->supi = NULL;
|
||||
}
|
||||
if (user_identifier->gpsi) {
|
||||
ogs_free(user_identifier->gpsi);
|
||||
user_identifier->gpsi = NULL;
|
||||
}
|
||||
if (user_identifier->validity_time) {
|
||||
ogs_free(user_identifier->validity_time);
|
||||
user_identifier->validity_time = NULL;
|
||||
}
|
||||
ogs_free(user_identifier);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_user_identifier_convertToJSON(OpenAPI_user_identifier_t *user_identifier)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (user_identifier == NULL) {
|
||||
ogs_error("OpenAPI_user_identifier_convertToJSON() failed [UserIdentifier]");
|
||||
|
|
@ -42,6 +53,10 @@ cJSON *OpenAPI_user_identifier_convertToJSON(OpenAPI_user_identifier_t *user_ide
|
|||
}
|
||||
|
||||
item = cJSON_CreateObject();
|
||||
if (!user_identifier->supi) {
|
||||
ogs_error("OpenAPI_user_identifier_convertToJSON() failed [supi]");
|
||||
return NULL;
|
||||
}
|
||||
if (cJSON_AddStringToObject(item, "supi", user_identifier->supi) == NULL) {
|
||||
ogs_error("OpenAPI_user_identifier_convertToJSON() failed [supi]");
|
||||
goto end;
|
||||
|
|
@ -68,30 +83,31 @@ end:
|
|||
OpenAPI_user_identifier_t *OpenAPI_user_identifier_parseFromJSON(cJSON *user_identifierJSON)
|
||||
{
|
||||
OpenAPI_user_identifier_t *user_identifier_local_var = NULL;
|
||||
cJSON *supi = cJSON_GetObjectItemCaseSensitive(user_identifierJSON, "supi");
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *supi = NULL;
|
||||
cJSON *gpsi = NULL;
|
||||
cJSON *validity_time = NULL;
|
||||
supi = cJSON_GetObjectItemCaseSensitive(user_identifierJSON, "supi");
|
||||
if (!supi) {
|
||||
ogs_error("OpenAPI_user_identifier_parseFromJSON() failed [supi]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (!cJSON_IsString(supi)) {
|
||||
ogs_error("OpenAPI_user_identifier_parseFromJSON() failed [supi]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
cJSON *gpsi = cJSON_GetObjectItemCaseSensitive(user_identifierJSON, "gpsi");
|
||||
|
||||
gpsi = cJSON_GetObjectItemCaseSensitive(user_identifierJSON, "gpsi");
|
||||
if (gpsi) {
|
||||
if (!cJSON_IsString(gpsi)) {
|
||||
if (!cJSON_IsString(gpsi) && !cJSON_IsNull(gpsi)) {
|
||||
ogs_error("OpenAPI_user_identifier_parseFromJSON() failed [gpsi]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
cJSON *validity_time = cJSON_GetObjectItemCaseSensitive(user_identifierJSON, "validityTime");
|
||||
|
||||
validity_time = cJSON_GetObjectItemCaseSensitive(user_identifierJSON, "validityTime");
|
||||
if (validity_time) {
|
||||
if (!cJSON_IsString(validity_time)) {
|
||||
if (!cJSON_IsString(validity_time) && !cJSON_IsNull(validity_time)) {
|
||||
ogs_error("OpenAPI_user_identifier_parseFromJSON() failed [validity_time]");
|
||||
goto end;
|
||||
}
|
||||
|
|
@ -99,8 +115,8 @@ OpenAPI_user_identifier_t *OpenAPI_user_identifier_parseFromJSON(cJSON *user_ide
|
|||
|
||||
user_identifier_local_var = OpenAPI_user_identifier_create (
|
||||
ogs_strdup(supi->valuestring),
|
||||
gpsi ? ogs_strdup(gpsi->valuestring) : NULL,
|
||||
validity_time ? ogs_strdup(validity_time->valuestring) : NULL
|
||||
gpsi && !cJSON_IsNull(gpsi) ? ogs_strdup(gpsi->valuestring) : NULL,
|
||||
validity_time && !cJSON_IsNull(validity_time) ? ogs_strdup(validity_time->valuestring) : NULL
|
||||
);
|
||||
|
||||
return user_identifier_local_var;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue