From 9af5c6b2bc4b77aee1a6ea563abf013a32083a24 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Tue, 15 Apr 2025 11:27:21 -0400 Subject: [PATCH] ensure during encode we never allow a source ID of 0; --- src/bridge/HostBridge.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/bridge/HostBridge.cpp b/src/bridge/HostBridge.cpp index e540310a..b26c62bc 100644 --- a/src/bridge/HostBridge.cpp +++ b/src/bridge/HostBridge.cpp @@ -1831,6 +1831,10 @@ void HostBridge::encodeDMRAudioFrame(uint8_t* pcm, uint32_t forcedSrcId, uint32_ if (forcedDstId > 0 && forcedDstId != m_dstId) dstId = forcedDstId; + // never allow a source ID of 0 + if (srcId == 0U) + srcId = m_srcId; + uint8_t* data = nullptr; m_dmrN = (uint8_t)(m_dmrSeqNo % 6); if (m_ambeCount == AMBE_PER_SLOT) { @@ -2646,6 +2650,10 @@ void HostBridge::encodeP25AudioFrame(uint8_t* pcm, uint32_t forcedSrcId, uint32_ if (forcedDstId > 0 && forcedDstId != m_dstId) dstId = forcedDstId; + // never allow a source ID of 0 + if (srcId == 0U) + srcId = m_srcId; + lc::LC lc = lc::LC(); lc.setLCO(LCO::GROUP); lc.setGroup(true);