From 2a03d79389764bf1f174c2a334a66b670addd5ee Mon Sep 17 00:00:00 2001 From: francescomani Date: Wed, 27 Mar 2024 17:58:01 +0100 Subject: [PATCH] adding a check on pusch_Config to avoid segfault --- openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c index 830c676862..22986d3c52 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c @@ -651,7 +651,8 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac, pusch_config_pdu->scid = 0; pusch_config_pdu->data_scrambling_id = mac->physCellId; - if (pusch_Config->dataScramblingIdentityPUSCH + if (pusch_Config + && pusch_Config->dataScramblingIdentityPUSCH && rnti_type == TYPE_C_RNTI_ && !(dci_format == NR_UL_DCI_FORMAT_0_0 && ss_type == NR_SearchSpace__searchSpaceType_PR_common)) pusch_config_pdu->data_scrambling_id = *pusch_Config->dataScramblingIdentityPUSCH; @@ -710,8 +711,8 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac, } /* FREQ_HOPPING_FLAG */ - if ((pusch_Config != NULL) - && (pusch_Config->frequencyHopping != NULL) + if (pusch_Config + && pusch_Config->frequencyHopping && (pusch_Config->resourceAllocation != NR_PUSCH_Config__resourceAllocation_resourceAllocationType0)) { pusch_config_pdu->frequency_hopping = dci->frequency_hopping_flag.val; }