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

Move BinaryMessage isFull() check into try block to prevent NPE. (#881)

Browse Source 
From issue 879:
When a BitSetFullException is caught and reset(0) is called, the
BinaryMessage is set to null.

This should resolve issue 879.
This commit is contained in:
Noah Lynch
2020-07-25 06:59:13 -04:00
committed by GitHub
parent e07d6fa854
commit 207893e5a8
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,6 +201,17 @@ public class P25P1MessageFramer implements Listener<Dibit>, IP25P1DataUnitDetect
{
mBinaryMessage.add(dibit.getBit1());
mBinaryMessage.add(dibit.getBit2());
if(mBinaryMessage.isFull())
{
//TDU's have a trailing status symbol that has to be removed -- set flag to true to suppress it.
if(mDataUnitID.hasTrailingStatusDibit())
{
mTrailingDibitsToSuppress = 1;
}
dispatchMessage();
}
}
catch(BitSetFullException bsfe)
{
@@ -209,17 +220,6 @@ public class P25P1MessageFramer implements Listener<Dibit>, IP25P1DataUnitDetect
//Reset so that we can start over again
reset(0);
}
if(mBinaryMessage.isFull())
{
//TDU's have a trailing status symbol that has to be removed -- set flag to true to suppress it.
if(mDataUnitID.hasTrailingStatusDibit())
{
mTrailingDibitsToSuppress = 1;
}
dispatchMessage();
}
}
else
{