GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-11 16:17:24 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1586 Resolves issue in P25 message framer where after transmitting the current message the mDataUnitId is set to null and this causes an NPE when subsequent code is executed prior to shutdown of the channel. (#1593)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2023-07-03 05:11:20 -04:00
committed by GitHub
parent ad2ab08466
commit adfc8b2d6f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageFramer.java
View File

@@ -322,17 +322,19 @@ public class P25P1MessageFramer implements Listener<Dibit>, IP25P1DataUnitDetect
TSBKMessage tsbkMessage = TSBKMessageFactory.create(mChannelStatusProcessor.getDirection(),
mDataUnitID, mBinaryMessage, mNAC, getTimestamp());
int messageLength = mDataUnitID.getMessageLength();
mMessageListener.receive(tsbkMessage);
if(tsbkMessage.isLastBlock())
{
reset(mDataUnitID.getMessageLength());
reset(messageLength);
mTrailingDibitsToSuppress = 1;
}
else
{
updateBitsProcessed(mDataUnitID.getMessageLength());
mBinaryMessage = new CorrectedBinaryMessage(mDataUnitID.getMessageLength());
updateBitsProcessed(messageLength);
mBinaryMessage = new CorrectedBinaryMessage(messageLength);
if(mDataUnitID == P25P1DataUnitID.TRUNKING_SIGNALING_BLOCK_1)
{
mDataUnitID = P25P1DataUnitID.TRUNKING_SIGNALING_BLOCK_2;