From b9068da99c389decaefd82ca1497097a3e4adf2c Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Mon, 9 Sep 2024 09:37:09 -0400 Subject: [PATCH] #1971 P25 AMBTC Status Query - Error Parsing Source Address (#1976) Co-authored-by: Dennis Sheirer --- .../p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java index 56f82d6f..f7c9a2c6 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/pdu/ambtc/osp/AMBTCStatusQuery.java @@ -85,7 +85,7 @@ public class AMBTCStatusQuery extends AMBTCMessage 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);