Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
2f4c21ce
Commit
2f4c21ce
authored
Feb 22, 2018
by
Yoshihiro Tomita
Browse files
Fix to avoid Segmemtation Fault in case of physicalConfigDedicated is NULL.
parent
1008080e
Changes
1
Hide whitespace changes
Inline
Side-by-side
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
2f4c21ce
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment