ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2024-11-26 00:58:37 -05:00
Code Issues Projects Releases Wiki Activity

Fix memory corruption.

Browse Source
This commit is contained in:
Jonathan Naylor 2021-08-24 18:46:27 +01:00
parent 93df9aa867
commit 2b351f0357
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NXDNReflector/NXDNReflector.cpp
View File

@ -228,7 +228,7 @@ void CNXDNReflector::run()
enum { enum {
ACTIVE_NONE, ACTIVE_NONE,
ACTIVE_YSF, ACTIVE_NXDN,
ACTIVE_ICOM, ACTIVE_ICOM,
ACTIVE_KENWOOD ACTIVE_KENWOOD
} active = ACTIVE_NONE; } active = ACTIVE_NONE;
@ -340,10 +340,10 @@ void CNXDNReflector::run()
std::string callsign = lookup->find(srcId); std::string callsign = lookup->find(srcId);
LogMessage("Transmission from %s at %s to %s%u", callsign.c_str(), current->m_callsign.c_str(), grp ? "TG " : "", dstId); LogMessage("Transmission from %s at %s to %s%u", callsign.c_str(), current->m_callsign.c_str(), grp ? "TG " : "", dstId);
active = ACTIVE_YSF; active = ACTIVE_NXDN;
} }
if (active == ACTIVE_YSF) { if (active == ACTIVE_NXDN) {
watchdogTimer.start(); watchdogTimer.start();
for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
@ -401,7 +401,7 @@ void CNXDNReflector::run()
if (tempGrp && tempDstId == tg) { if (tempGrp && tempDstId == tg) {
// Save the grp, src and dest for use in the NXDN Protocol messages // Save the grp, src and dest for use in the NXDN Protocol messages
grp = tempGrp; grp = tempGrp;
srcId = tempSrcId; srcId = tempSrcId;
dstId = tempDstId; dstId = tempDstId;
@ -449,7 +449,7 @@ void CNXDNReflector::run()
if (tempGrp && tempDstId == tg) { if (tempGrp && tempDstId == tg) {
// Save the grp, src and dest for use in the NXDN Protocol messages // Save the grp, src and dest for use in the NXDN Protocol messages
grp = tempGrp; grp = tempGrp;
srcId = tempSrcId; srcId = tempSrcId;
dstId = tempDstId; dstId = tempDstId;
@ -466,7 +466,7 @@ void CNXDNReflector::run()
if (tempGrp && tempDstId == tg) { if (tempGrp && tempDstId == tg) {
// Save the grp, src and dest for use in the NXDN Protocol messages // Save the grp, src and dest for use in the NXDN Protocol messages
grp = tempGrp; grp = tempGrp;
srcId = tempSrcId; srcId = tempSrcId;
dstId = tempDstId; dstId = tempDstId;
@ -515,8 +515,8 @@ void CNXDNReflector::run()
LogMessage("Removing %s (%s) disappeared", (*it)->m_callsign.c_str(), LogMessage("Removing %s (%s) disappeared", (*it)->m_callsign.c_str(),
CUDPSocket::display((*it)->m_addr, buff, 80U)); CUDPSocket::display((*it)->m_addr, buff, 80U));
m_repeaters.erase(it);
delete *it; delete *it;
m_repeaters.erase(it);
break; break;
} }
} }