[PATCH] osmo-pcu[master]: TBF-DL: extend index check for RLC block copy

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Max gerrit-no-reply at lists.osmocom.org
Fri Sep 8 10:26:01 UTC 2017


Review at  https://gerrit.osmocom.org/3892

TBF-DL: extend index check for RLC block copy

Log number of RLC blocks to copy and assert if trying to copy too many
blocks.

Change-Id: I01cbc26ec67400a44e9fff3f9a30d729320380f9
Fixes: CID143069
---
M src/tbf_dl.cpp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/92/3892/1

diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 1dd7dd8..a5cc372 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -757,6 +757,8 @@
 	OSMO_ASSERT(rlc.num_data_blocks <= ARRAY_SIZE(rlc.block_info));
 	OSMO_ASSERT(rlc.num_data_blocks > 0);
 
+	LOGP(DRLCMACDL, LOGL_DEBUG, "- copying %u RLC blocks, %u BSNs\n", rlc.num_data_blocks, num_bsns);
+
 	/* Copy block(s) to RLC message */
 	for (data_block_idx = 0; data_block_idx < rlc.num_data_blocks;
 		data_block_idx++)
@@ -782,6 +784,7 @@
 			OSMO_ASSERT(m_rlc.block(bsn)->next_ps >= EGPRS_PS_1);
 			OSMO_ASSERT(m_rlc.block(bsn)->next_ps <= EGPRS_PS_3);
 		}
+		OSMO_ASSERT(data_block_idx < 2); /* punct defined above as 2-element array */
 		punct[data_block_idx] = m_rlc.block(bsn)->next_ps;
 
 		rdbi = &rlc.block_info[data_block_idx];

-- 
To view, visit https://gerrit.osmocom.org/3892
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01cbc26ec67400a44e9fff3f9a30d729320380f9
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>



More information about the gerrit-log mailing list