From a2c5b6e9d942838c27fc56a76ddec76afba01c4b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 30 Apr 2020 19:59:13 +0200 Subject: RLCMAC_EncDEc.cc: dec_RlcmacUl(Egprs)DataBlock: fix tlli and pfi uninitialized instead of omit Change-Id: Id63ae66cd715512f12eb87fd9ff0a9f5af93d5d2 --- library/RLCMAC_EncDec.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'library') diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index f4735e9f..d544e69b 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -606,10 +606,14 @@ RlcmacUlDataBlock dec__RlcmacUlDataBlock(const OCTETSTRING& stream) if (ret_val.mac__hdr().tlli__ind()) { ret_val.tlli() = OCTETSTRING(4, ttcn_buffer.get_read_data()); ttcn_buffer.increase_pos(4); + } else { + ret_val.tlli() = OMIT_VALUE; } /* parse optional PFI */ if (ret_val.mac__hdr().pfi__ind()) { ret_val.pfi().decode(RlcmacUlDataBlock_pfi_descr_, ttcn_buffer, TTCN_EncDec::CT_RAW); + } else { + ret_val.pfi() = OMIT_VALUE; } /* RLC blocks at end */ @@ -734,10 +738,14 @@ RlcmacUlEgprsDataBlock dec__RlcmacUlEgprsDataBlock(const OCTETSTRING& stream, Co if (ret_val.tlli__ind()) { ret_val.tlli() = OCTETSTRING(4, aligned_buffer.get_read_data()); aligned_buffer.increase_pos(4); + } else { + ret_val.tlli() = OMIT_VALUE; } /* parse optional PFI */ if (ret_val.mac__hdr().pfi__ind()) { ret_val.pfi().decode(RlcmacUlDataBlock_pfi_descr_, aligned_buffer, TTCN_EncDec::CT_RAW); + } else { + ret_val.pfi() = OMIT_VALUE; } /* RLC blocks at end */ -- cgit v1.2.3