Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
oai
openairinterface5G
Commits
4d66dba0
Commit
4d66dba0
authored
5 years ago
by
Wu Jing
Browse files
Options
Downloads
Patches
Plain Diff
avoid segfault in RLC
parent
21d13ef4
No related branches found
No related tags found
5 merge requests
!650
Release v1.1.0 Candidate
,
!649
Develop: Integration 2019 Week 30
,
!642
Develop: Integration 2019 Mid-Week 29
,
!630
nfapi interface bug fix
,
!588
Develop nr merge
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
+7
-1
7 additions, 1 deletion
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
with
7 additions
and
1 deletion
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c
+
7
−
1
View file @
4d66dba0
...
@@ -938,7 +938,7 @@ rlc_am_rx_check_all_byte_segments(
...
@@ -938,7 +938,7 @@ rlc_am_rx_check_all_byte_segments(
rlc_am_pdu_info_t
*
pdu_info_p
=
&
((
rlc_am_rx_pdu_management_t
*
)(
tb_pP
->
data
))
->
pdu_info
;
rlc_am_pdu_info_t
*
pdu_info_p
=
&
((
rlc_am_rx_pdu_management_t
*
)(
tb_pP
->
data
))
->
pdu_info
;
mem_block_t
*
cursor_p
=
NULL
;
mem_block_t
*
cursor_p
=
NULL
;
mem_block_t
*
first_cursor_p
=
NULL
;
mem_block_t
*
first_cursor_p
=
NULL
;
rlc_sn_t
sn
=
pdu_info_p
->
sn
;
rlc_
u
sn_t
sn
=
pdu_info_p
->
sn
;
sdu_size_t
next_waited_so
;
sdu_size_t
next_waited_so
;
sdu_size_t
last_end_so
;
sdu_size_t
last_end_so
;
...
@@ -969,6 +969,9 @@ rlc_am_rx_check_all_byte_segments(
...
@@ -969,6 +969,9 @@ rlc_am_rx_check_all_byte_segments(
// the so field of the first PDU should be 0
// the so field of the first PDU should be 0
//cursor_p = list.head;
//cursor_p = list.head;
//we start from the first stored PDU segment of this SN
//we start from the first stored PDU segment of this SN
if
(
cursor_p
->
data
==
NULL
){
return
;
}
pdu_info_p
=
&
((
rlc_am_rx_pdu_management_t
*
)(
cursor_p
->
data
))
->
pdu_info
;
pdu_info_p
=
&
((
rlc_am_rx_pdu_management_t
*
)(
cursor_p
->
data
))
->
pdu_info
;
// if the first segment does not have SO = 0 then no need to continue
// if the first segment does not have SO = 0 then no need to continue
...
@@ -985,6 +988,9 @@ rlc_am_rx_check_all_byte_segments(
...
@@ -985,6 +988,9 @@ rlc_am_rx_check_all_byte_segments(
while
(
cursor_p
->
next
!=
NULL
)
{
while
(
cursor_p
->
next
!=
NULL
)
{
//msg("rlc_am_rx_check_all_byte_segments(%d) @4\n",sn);
//msg("rlc_am_rx_check_all_byte_segments(%d) @4\n",sn);
cursor_p
=
cursor_p
->
next
;
cursor_p
=
cursor_p
->
next
;
if
(
cursor_p
->
data
==
NULL
){
return
;
}
pdu_info_p
=
&
((
rlc_am_rx_pdu_management_t
*
)(
cursor_p
->
data
))
->
pdu_info
;
pdu_info_p
=
&
((
rlc_am_rx_pdu_management_t
*
)(
cursor_p
->
data
))
->
pdu_info
;
if
(
pdu_info_p
->
sn
==
sn
)
{
if
(
pdu_info_p
->
sn
==
sn
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment