mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-04 22:30: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,22 +22,33 @@ OpenAPI_plmn_snssai_t *OpenAPI_plmn_snssai_create(
|
|||
|
||||
void OpenAPI_plmn_snssai_free(OpenAPI_plmn_snssai_t *plmn_snssai)
|
||||
{
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (NULL == plmn_snssai) {
|
||||
return;
|
||||
}
|
||||
OpenAPI_lnode_t *node;
|
||||
OpenAPI_plmn_id_free(plmn_snssai->plmn_id);
|
||||
OpenAPI_list_for_each(plmn_snssai->s_nssai_list, node) {
|
||||
OpenAPI_ext_snssai_free(node->data);
|
||||
if (plmn_snssai->plmn_id) {
|
||||
OpenAPI_plmn_id_free(plmn_snssai->plmn_id);
|
||||
plmn_snssai->plmn_id = NULL;
|
||||
}
|
||||
if (plmn_snssai->s_nssai_list) {
|
||||
OpenAPI_list_for_each(plmn_snssai->s_nssai_list, node) {
|
||||
OpenAPI_ext_snssai_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(plmn_snssai->s_nssai_list);
|
||||
plmn_snssai->s_nssai_list = NULL;
|
||||
}
|
||||
if (plmn_snssai->nid) {
|
||||
ogs_free(plmn_snssai->nid);
|
||||
plmn_snssai->nid = NULL;
|
||||
}
|
||||
OpenAPI_list_free(plmn_snssai->s_nssai_list);
|
||||
ogs_free(plmn_snssai->nid);
|
||||
ogs_free(plmn_snssai);
|
||||
}
|
||||
|
||||
cJSON *OpenAPI_plmn_snssai_convertToJSON(OpenAPI_plmn_snssai_t *plmn_snssai)
|
||||
{
|
||||
cJSON *item = NULL;
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
|
||||
if (plmn_snssai == NULL) {
|
||||
ogs_error("OpenAPI_plmn_snssai_convertToJSON() failed [PlmnSnssai]");
|
||||
|
|
@ -45,6 +56,10 @@ cJSON *OpenAPI_plmn_snssai_convertToJSON(OpenAPI_plmn_snssai_t *plmn_snssai)
|
|||
}
|
||||
|
||||
item = cJSON_CreateObject();
|
||||
if (!plmn_snssai->plmn_id) {
|
||||
ogs_error("OpenAPI_plmn_snssai_convertToJSON() failed [plmn_id]");
|
||||
return NULL;
|
||||
}
|
||||
cJSON *plmn_id_local_JSON = OpenAPI_plmn_id_convertToJSON(plmn_snssai->plmn_id);
|
||||
if (plmn_id_local_JSON == NULL) {
|
||||
ogs_error("OpenAPI_plmn_snssai_convertToJSON() failed [plmn_id]");
|
||||
|
|
@ -56,22 +71,22 @@ cJSON *OpenAPI_plmn_snssai_convertToJSON(OpenAPI_plmn_snssai_t *plmn_snssai)
|
|||
goto end;
|
||||
}
|
||||
|
||||
if (!plmn_snssai->s_nssai_list) {
|
||||
ogs_error("OpenAPI_plmn_snssai_convertToJSON() failed [s_nssai_list]");
|
||||
return NULL;
|
||||
}
|
||||
cJSON *s_nssai_listList = cJSON_AddArrayToObject(item, "sNssaiList");
|
||||
if (s_nssai_listList == NULL) {
|
||||
ogs_error("OpenAPI_plmn_snssai_convertToJSON() failed [s_nssai_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_lnode_t *s_nssai_list_node;
|
||||
if (plmn_snssai->s_nssai_list) {
|
||||
OpenAPI_list_for_each(plmn_snssai->s_nssai_list, s_nssai_list_node) {
|
||||
cJSON *itemLocal = OpenAPI_ext_snssai_convertToJSON(s_nssai_list_node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_plmn_snssai_convertToJSON() failed [s_nssai_list]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(s_nssai_listList, itemLocal);
|
||||
OpenAPI_list_for_each(plmn_snssai->s_nssai_list, node) {
|
||||
cJSON *itemLocal = OpenAPI_ext_snssai_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_plmn_snssai_convertToJSON() failed [s_nssai_list]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(s_nssai_listList, itemLocal);
|
||||
}
|
||||
|
||||
if (plmn_snssai->nid) {
|
||||
|
|
@ -88,50 +103,49 @@ end:
|
|||
OpenAPI_plmn_snssai_t *OpenAPI_plmn_snssai_parseFromJSON(cJSON *plmn_snssaiJSON)
|
||||
{
|
||||
OpenAPI_plmn_snssai_t *plmn_snssai_local_var = NULL;
|
||||
cJSON *plmn_id = cJSON_GetObjectItemCaseSensitive(plmn_snssaiJSON, "plmnId");
|
||||
OpenAPI_lnode_t *node = NULL;
|
||||
cJSON *plmn_id = NULL;
|
||||
OpenAPI_plmn_id_t *plmn_id_local_nonprim = NULL;
|
||||
cJSON *s_nssai_list = NULL;
|
||||
OpenAPI_list_t *s_nssai_listList = NULL;
|
||||
cJSON *nid = NULL;
|
||||
plmn_id = cJSON_GetObjectItemCaseSensitive(plmn_snssaiJSON, "plmnId");
|
||||
if (!plmn_id) {
|
||||
ogs_error("OpenAPI_plmn_snssai_parseFromJSON() failed [plmn_id]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_plmn_id_t *plmn_id_local_nonprim = NULL;
|
||||
plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id);
|
||||
|
||||
cJSON *s_nssai_list = cJSON_GetObjectItemCaseSensitive(plmn_snssaiJSON, "sNssaiList");
|
||||
s_nssai_list = cJSON_GetObjectItemCaseSensitive(plmn_snssaiJSON, "sNssaiList");
|
||||
if (!s_nssai_list) {
|
||||
ogs_error("OpenAPI_plmn_snssai_parseFromJSON() failed [s_nssai_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
OpenAPI_list_t *s_nssai_listList;
|
||||
cJSON *s_nssai_list_local_nonprimitive;
|
||||
if (!cJSON_IsArray(s_nssai_list)){
|
||||
ogs_error("OpenAPI_plmn_snssai_parseFromJSON() failed [s_nssai_list]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
s_nssai_listList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(s_nssai_list_local_nonprimitive, s_nssai_list ) {
|
||||
if (!cJSON_IsObject(s_nssai_list_local_nonprimitive)) {
|
||||
cJSON *s_nssai_list_local = NULL;
|
||||
if (!cJSON_IsArray(s_nssai_list)) {
|
||||
ogs_error("OpenAPI_plmn_snssai_parseFromJSON() failed [s_nssai_list]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_ext_snssai_t *s_nssai_listItem = OpenAPI_ext_snssai_parseFromJSON(s_nssai_list_local_nonprimitive);
|
||||
|
||||
if (!s_nssai_listItem) {
|
||||
ogs_error("No s_nssai_listItem");
|
||||
OpenAPI_list_free(s_nssai_listList);
|
||||
goto end;
|
||||
s_nssai_listList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(s_nssai_list_local, s_nssai_list) {
|
||||
if (!cJSON_IsObject(s_nssai_list_local)) {
|
||||
ogs_error("OpenAPI_plmn_snssai_parseFromJSON() failed [s_nssai_list]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_ext_snssai_t *s_nssai_listItem = OpenAPI_ext_snssai_parseFromJSON(s_nssai_list_local);
|
||||
if (!s_nssai_listItem) {
|
||||
ogs_error("No s_nssai_listItem");
|
||||
OpenAPI_list_free(s_nssai_listList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(s_nssai_listList, s_nssai_listItem);
|
||||
}
|
||||
|
||||
OpenAPI_list_add(s_nssai_listList, s_nssai_listItem);
|
||||
}
|
||||
|
||||
cJSON *nid = cJSON_GetObjectItemCaseSensitive(plmn_snssaiJSON, "nid");
|
||||
|
||||
nid = cJSON_GetObjectItemCaseSensitive(plmn_snssaiJSON, "nid");
|
||||
if (nid) {
|
||||
if (!cJSON_IsString(nid)) {
|
||||
if (!cJSON_IsString(nid) && !cJSON_IsNull(nid)) {
|
||||
ogs_error("OpenAPI_plmn_snssai_parseFromJSON() failed [nid]");
|
||||
goto end;
|
||||
}
|
||||
|
|
@ -140,11 +154,22 @@ OpenAPI_plmn_snssai_t *OpenAPI_plmn_snssai_parseFromJSON(cJSON *plmn_snssaiJSON)
|
|||
plmn_snssai_local_var = OpenAPI_plmn_snssai_create (
|
||||
plmn_id_local_nonprim,
|
||||
s_nssai_listList,
|
||||
nid ? ogs_strdup(nid->valuestring) : NULL
|
||||
nid && !cJSON_IsNull(nid) ? ogs_strdup(nid->valuestring) : NULL
|
||||
);
|
||||
|
||||
return plmn_snssai_local_var;
|
||||
end:
|
||||
if (plmn_id_local_nonprim) {
|
||||
OpenAPI_plmn_id_free(plmn_id_local_nonprim);
|
||||
plmn_id_local_nonprim = NULL;
|
||||
}
|
||||
if (s_nssai_listList) {
|
||||
OpenAPI_list_for_each(s_nssai_listList, node) {
|
||||
OpenAPI_ext_snssai_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(s_nssai_listList);
|
||||
s_nssai_listList = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue