g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2026-04-21 06:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix uninitialized m_netId in MMDVMNetwork outgoing packets

Browse source 
m_netId was allocated but never written to, sending 4 bytes of heap
garbage in the repeater ID field of every outgoing DMRD packet. Derive
the bytes from m_id (which is properly set from incoming DMRC config
packets) and remove the unused m_netId member entirely.
This commit is contained in:
Ember 2026-04-05 17:52:07 -07:00
parent 65eaf779b0
commit e18fc47845
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MMDVMNetwork.cpp
View file

@ -34,7 +34,6 @@ CMMDVMNetwork::CMMDVMNetwork(const std::string& rptAddress, unsigned short rptPo
m_rptAddr(),
m_rptAddrLen(0U),
m_id(0U),
m_netId(nullptr),
m_debug(debug),
m_socket(localAddress, localPort),
m_buffer(nullptr),
@ -53,8 +52,6 @@ m_talkerAliasLen(0U)
m_rptAddrLen = 0U;
m_buffer = new unsigned char[BUFFER_LENGTH];
m_netId = new unsigned char[4U];
m_radioPositionData = new unsigned char[50U];
m_talkerAliasData = new unsigned char[50U];
@ -64,7 +61,6 @@ m_talkerAliasLen(0U)
CMMDVMNetwork::~CMMDVMNetwork()
{
delete[] m_netId;
delete[] m_buffer;
delete[] m_configData;
delete[] m_radioPositionData;
@ -180,7 +176,10 @@ bool CMMDVMNetwork::write(const CDMRData& data)
buffer[9U] = dstId >> 8;
buffer[10U] = dstId >> 0;
::memcpy(buffer + 11U, m_netId, 4U);
buffer[11U] = m_id >> 24;
buffer[12U] = m_id >> 16;
buffer[13U] = m_id >> 8;
buffer[14U] = m_id >> 0;
unsigned int slotNo = data.getSlotNo();