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
1b171e79
Commit
1b171e79
authored
Aug 21, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix memory leaks in do_RRCReconfiguration()
parent
c325c6a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
11 deletions
+18
-11
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+18
-11
No files found.
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
1b171e79
...
...
@@ -679,7 +679,6 @@ int16_t do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
NR_DL_DCCH_Message_t
dl_dcch_msg
=
{
0
};
asn_enc_rval_t
enc_rval
;
NR_RRCReconfiguration_IEs_t
*
ie
;
unsigned
char
masterCellGroup_buf
[
1000
];
dl_dcch_msg
.
message
.
present
=
NR_DL_DCCH_MessageType_PR_c1
;
asn1cCalloc
(
dl_dcch_msg
.
message
.
choice
.
c1
,
c1
);
// = CALLOC(1, sizeof(struct NR_DL_DCCH_MessageType__c1));
...
...
@@ -723,20 +722,15 @@ int16_t do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
}
if
(
cellGroupConfig
!=
NULL
)
{
enc_rval
=
uper_encode_to_buffer
(
&
asn_DEF_NR_CellGroupConfig
,
NULL
,
(
void
*
)
cellGroupConfig
,
masterCellGroup_buf
,
1000
);
AssertFatal
(
enc_rval
.
encoded
>
0
,
"ASN1 message encoding failed (%s, %lu)!
\n
"
,
enc_rval
.
failed_type
->
name
,
enc_rval
.
encoded
);
uint8_t
*
buf
=
NULL
;
ssize_t
len
=
uper_encode_to_new_buffer
(
&
asn_DEF_NR_CellGroupConfig
,
NULL
,
cellGroupConfig
,
(
void
**
)
&
buf
);
AssertFatal
(
len
>
0
,
"ASN1 message encoding failed (%lu)!
\n
"
,
len
);
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
)
)
{
xer_fprint
(
stdout
,
&
asn_DEF_NR_CellGroupConfig
,
(
const
void
*
)
cellGroupConfig
);
}
ie
->
nonCriticalExtension
->
masterCellGroup
=
calloc
(
1
,
sizeof
(
OCTET_STRING_t
));
ie
->
nonCriticalExtension
->
masterCellGroup
->
buf
=
masterCellGroup_buf
;
ie
->
nonCriticalExtension
->
masterCellGroup
->
size
=
(
enc_rval
.
encoded
+
7
)
/
8
;
ie
->
nonCriticalExtension
->
masterCellGroup
->
buf
=
buf
;
ie
->
nonCriticalExtension
->
masterCellGroup
->
size
=
len
;
}
dl_dcch_msg
.
message
.
choice
.
c1
->
choice
.
rrcReconfiguration
->
criticalExtensions
.
choice
.
rrcReconfiguration
=
ie
;
...
...
@@ -754,6 +748,19 @@ int16_t do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
AssertFatal
(
enc_rval
.
encoded
>
0
,
"ASN1 message encoding failed (%s, %lu)!
\n
"
,
enc_rval
.
failed_type
->
name
,
enc_rval
.
encoded
);
// don't free what we did not allocate, so set fields with pointers to NULL
// if memory comes from outside
ie
->
measConfig
=
NULL
;
if
(
ie
->
radioBearerConfig
)
{
ie
->
radioBearerConfig
->
srb_ToAddModList
=
NULL
;
ie
->
radioBearerConfig
->
drb_ToAddModList
=
NULL
;
ie
->
radioBearerConfig
->
securityConfig
=
NULL
;
ie
->
radioBearerConfig
->
srb3_ToRelease
=
NULL
;
ie
->
radioBearerConfig
->
drb_ToReleaseList
=
NULL
;
}
if
(
ie
->
nonCriticalExtension
)
ie
->
nonCriticalExtension
->
dedicatedNAS_MessageList
=
NULL
;
ASN_STRUCT_FREE_CONTENTS_ONLY
(
asn_DEF_NR_DL_DCCH_Message
,
&
dl_dcch_msg
);
LOG_D
(
NR_RRC
,
"RRCReconfiguration for UE %d: Encoded %zd bits (%zd bytes)
\n
"
,
UE
->
rrc_ue_id
,
...
...
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