maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to avoid Segmemtation Fault in case of physicalConfigDedicated is NULL.

Browse Source
This commit is contained in:
tomita
2018-02-22 17:10:21 +09:00
parent 1008080e31
commit 2f4c21ced3
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+24 -18
View File
@@ -1451,24 +1451,30 @@ fill_nfapi_harq_information(module_id_t module_idP,
// [UE_id].physicalConfigDedicated->
// pucch_ConfigDedicated != NULL,
// "pucch_ConfigDedicated is null for TDD!\n");
if ((UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated->
pucch_ConfigDedicated != NULL)
&& (UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated->
pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
&& (*UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated->
pucch_ConfigDedicated->tdd_AckNackFeedbackMode ==
PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
{
harq_information->harq_information_rel10_tdd.harq_size = 2; // 2-bit ACK/NAK
harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing
} else {
harq_information->harq_information_rel10_tdd.harq_size = 1; // 1-bit ACK/NAK
harq_information->harq_information_rel10_tdd.ack_nack_mode = 0; // bundling
}
harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG;
if (UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated != NULL){
if ((UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated->
pucch_ConfigDedicated != NULL)
&& (UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated->
pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
&& (*UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated->
pucch_ConfigDedicated->tdd_AckNackFeedbackMode ==
PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
{
harq_information->harq_information_rel10_tdd.harq_size = 2; // 2-bit ACK/NAK
harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing
} else {
harq_information->harq_information_rel10_tdd.harq_size = 1; // 1-bit ACK/NAK
harq_information->harq_information_rel10_tdd.ack_nack_mode = 0; // bundling
}
} else {
harq_information->harq_information_rel10_tdd.harq_size = 1; // 1-bit ACK/NAK
harq_information->harq_information_rel10_tdd.ack_nack_mode = 0; // bundling
}
harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG;
harq_information->harq_information_rel10_tdd.n_pucch_1_0 =
cc->radioResourceConfigCommon->pucch_ConfigCommon.
n1PUCCH_AN + cce_idxP;