#1971 P25 AMBTC Status Query - Error Parsing Source Address (#1976)

Co-authored-by: Dennis Sheirer <[email protected]>
DSheirer · Sep 9, 2024 · b9068da · b9068da
1 parent 9f3f7e6
commit b9068da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...a/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java b/...a/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java
@@ -85,7 +85,7 @@ public APCO25FullyQualifiedRadioIdentifier getTargetAddress()
 
     public APCO25FullyQualifiedRadioIdentifier getSourceAddress()
     {
-        if(mSourceAddress == null)
+        if(mSourceAddress == null && hasDataBlock(0) && hasDataBlock(1))
         {
             int localAddress = getDataBlock(0).getMessage().getInt(BLOCK_0_SOURCE_ADDRESS) << 8;
             localAddress += getDataBlock(1).getMessage().getInt(BLOCK_1_SOURCE_ADDRESS);