Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
38a6e92f
Commit
38a6e92f
authored
Oct 23, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deep-copy genericParameters to prevent double-free
parent
d4cc2c85
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_config.c
+13
-2
No files found.
openair2/RRC/NR/nr_rrc_config.c
View file @
38a6e92f
...
...
@@ -41,6 +41,17 @@
const
uint8_t
slotsperframe
[
5
]
=
{
10
,
20
,
40
,
80
,
160
};
static
NR_BWP_t
clone_generic_parameters
(
const
NR_BWP_t
*
gp
)
{
NR_BWP_t
clone
=
{
0
};
clone
.
locationAndBandwidth
=
gp
->
locationAndBandwidth
;
clone
.
subcarrierSpacing
=
gp
->
subcarrierSpacing
;
if
(
gp
->
cyclicPrefix
)
{
asn1cCallocOne
(
clone
.
cyclicPrefix
,
*
gp
->
cyclicPrefix
);
}
return
clone
;
}
static
NR_SearchSpace_t
*
rrc_searchspace_config
(
bool
is_common
,
int
searchspaceid
,
int
coresetid
)
{
...
...
@@ -1811,7 +1822,7 @@ NR_BCCH_DL_SCH_Message_t *get_SIB1_NR(const NR_ServingCellConfigCommon_t *scc, c
// servingCellConfigCommon
asn1cCalloc
(
sib1
->
servingCellConfigCommon
,
ServCellCom
);
NR_BWP_DownlinkCommon_t
*
initialDownlinkBWP
=
&
ServCellCom
->
downlinkConfigCommon
.
initialDownlinkBWP
;
initialDownlinkBWP
->
genericParameters
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
;
initialDownlinkBWP
->
genericParameters
=
clone_generic_parameters
(
&
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
)
;
const
NR_FrequencyInfoDL_t
*
frequencyInfoDL
=
scc
->
downlinkConfigCommon
->
frequencyInfoDL
;
for
(
int
i
=
0
;
i
<
frequencyInfoDL
->
frequencyBandList
.
list
.
count
;
i
++
)
{
...
...
@@ -1897,7 +1908,7 @@ NR_BCCH_DL_SCH_Message_t *get_SIB1_NR(const NR_ServingCellConfigCommon_t *scc, c
}
}
UL
->
initialUplinkBWP
.
genericParameters
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
;
UL
->
initialUplinkBWP
.
genericParameters
=
clone_generic_parameters
(
&
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
)
;
UL
->
initialUplinkBWP
.
rach_ConfigCommon
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
;
UL
->
initialUplinkBWP
.
pusch_ConfigCommon
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
;
UL
->
initialUplinkBWP
.
pusch_ConfigCommon
->
choice
.
setup
->
groupHoppingEnabledTransformPrecoding
=
NULL
;
...
...
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