Skip to content

O
OpenXG-RAN
Commit 2f4c21ce authored by tomita's avatar tomita
Browse files
Options

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

parent 1008080e
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 18 deletions
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @ 2f4c21ce
...@@ -1451,24 +1451,30 @@ fill_nfapi_harq_information(module_id_t module_idP, ...@@ -1451,24 +1451,30 @@ fill_nfapi_harq_information(module_id_t module_idP,
// [UE_id].physicalConfigDedicated-> // [UE_id].physicalConfigDedicated->
// pucch_ConfigDedicated != NULL, // pucch_ConfigDedicated != NULL,
// "pucch_ConfigDedicated is null for TDD!\n"); // "pucch_ConfigDedicated is null for TDD!\n");
if ((UE_list-> if (UE_list->
UE_template[CC_idP][UE_id].physicalConfigDedicated-> UE_template[CC_idP][UE_id].physicalConfigDedicated != NULL){
pucch_ConfigDedicated != NULL) if ((UE_list->
&& (UE_list-> UE_template[CC_idP][UE_id].physicalConfigDedicated->
UE_template[CC_idP][UE_id].physicalConfigDedicated-> pucch_ConfigDedicated != NULL)
pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL) && (UE_list->
&& (*UE_list-> UE_template[CC_idP][UE_id].physicalConfigDedicated->
UE_template[CC_idP][UE_id].physicalConfigDedicated-> pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
pucch_ConfigDedicated->tdd_AckNackFeedbackMode == && (*UE_list->
PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing)) UE_template[CC_idP][UE_id].physicalConfigDedicated->
{ pucch_ConfigDedicated->tdd_AckNackFeedbackMode ==
harq_information->harq_information_rel10_tdd.harq_size = 2; // 2-bit ACK/NAK PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing {
} else { harq_information->harq_information_rel10_tdd.harq_size = 2; // 2-bit ACK/NAK
harq_information->harq_information_rel10_tdd.harq_size = 1; // 1-bit ACK/NAK harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing
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.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG; 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 = harq_information->harq_information_rel10_tdd.n_pucch_1_0 =
cc->radioResourceConfigCommon->pucch_ConfigCommon. cc->radioResourceConfigCommon->pucch_ConfigCommon.
n1PUCCH_AN + cce_idxP; n1PUCCH_AN + cce_idxP;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment