From 6370ad25fae242a1b09284a701c15807eacc4881 Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Thu, 16 Jan 2025 10:29:12 +0100 Subject: [PATCH] Use calloc_or_fail whenever possible --- openair2/RRC/NR/MESSAGES/asn1_msg.c | 9 +++------ openair2/RRC/NR/rrc_gNB_mobility.c | 12 ++++-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c index e3df557d3d..b3d9c2e9e4 100644 --- a/openair2/RRC/NR/MESSAGES/asn1_msg.c +++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c @@ -1416,15 +1416,12 @@ int do_NR_Paging(uint8_t Mod_id, uint8_t *buffer, uint32_t tmsi) * in encoded form which we decode + add to the handoverPreparationInformation */ int do_NR_HandoverPreparationInformation(const uint8_t *uecap_buf, int uecap_buf_size, uint8_t *buf, int buf_size) { - NR_HandoverPreparationInformation_t *hpi = calloc(1, sizeof(*hpi)); - AssertFatal(hpi != NULL, "out of memory\n"); + NR_HandoverPreparationInformation_t *hpi = calloc_or_fail(1, sizeof(*hpi)); hpi->criticalExtensions.present = NR_HandoverPreparationInformation__criticalExtensions_PR_c1; - hpi->criticalExtensions.choice.c1 = calloc(1, sizeof(*hpi->criticalExtensions.choice.c1)); - AssertFatal(hpi->criticalExtensions.choice.c1 != NULL, "out of memory\n"); + hpi->criticalExtensions.choice.c1 = calloc_or_fail(1, sizeof(*hpi->criticalExtensions.choice.c1)); hpi->criticalExtensions.choice.c1->present = NR_HandoverPreparationInformation__criticalExtensions__c1_PR_handoverPreparationInformation; - NR_HandoverPreparationInformation_IEs_t *hpi_ie = calloc(1, sizeof(*hpi_ie)); - AssertFatal(hpi_ie != NULL, "out of memory\n"); + NR_HandoverPreparationInformation_IEs_t *hpi_ie = calloc_or_fail(1, sizeof(*hpi_ie)); hpi->criticalExtensions.choice.c1->choice.handoverPreparationInformation = hpi_ie; NR_UE_CapabilityRAT_ContainerList_t *list = NULL; diff --git a/openair2/RRC/NR/rrc_gNB_mobility.c b/openair2/RRC/NR/rrc_gNB_mobility.c index e4c4e8b67e..548da5c19a 100644 --- a/openair2/RRC/NR/rrc_gNB_mobility.c +++ b/openair2/RRC/NR/rrc_gNB_mobility.c @@ -39,15 +39,12 @@ typedef enum { HO_CTX_BOTH, HO_CTX_SOURCE, HO_CTX_TARGET } ho_ctx_type_t; static nr_handover_context_t *alloc_ho_ctx(ho_ctx_type_t type) { - nr_handover_context_t *ho_ctx = calloc(1, sizeof(*ho_ctx)); - AssertFatal(ho_ctx != NULL, "out of memory\n"); + nr_handover_context_t *ho_ctx = calloc_or_fail(1, sizeof(*ho_ctx)); if (type == HO_CTX_SOURCE || type == HO_CTX_BOTH) { - ho_ctx->source = calloc(1, sizeof(*ho_ctx->source)); - AssertFatal(ho_ctx->source != NULL, "out of memory\n"); + ho_ctx->source = calloc_or_fail(1, sizeof(*ho_ctx->source)); } if (type == HO_CTX_TARGET || type == HO_CTX_BOTH) { - ho_ctx->target = calloc(1, sizeof(*ho_ctx->target)); - AssertFatal(ho_ctx->target != NULL, "out of memory\n"); + ho_ctx->target = calloc_or_fail(1, sizeof(*ho_ctx->target)); } return ho_ctx; } @@ -157,8 +154,7 @@ static void nr_initiate_handover(const gNB_RRC_INST *rrc, // this changes AssertFatal(pdu->param.nb_qos == 1, "only 1 Qos flow supported\n"); drb->drb_info.flows_to_be_setup_length = 1; - drb->drb_info.flows_mapped_to_drb = calloc(1, sizeof(f1ap_flows_mapped_to_drb_t)); - AssertFatal(drb->drb_info.flows_mapped_to_drb, "could not allocate memory\n"); + drb->drb_info.flows_mapped_to_drb = calloc_or_fail(1, sizeof(f1ap_flows_mapped_to_drb_t)); int qfi = rrc_drb->cnAssociation.sdap_config.mappedQoS_FlowsToAdd[0]; DevAssert(qfi > 0); drb->drb_info.flows_mapped_to_drb[0].qfi = qfi;