mirror of
https://github.com/ShaYmez/P25Clients.git
synced 2025-07-31 13:12:28 -04:00
Merge pull request #220 from miguelestrada/miguelestrada-delete-correct-rpt
Avoid memory corruption - Delete correct expired or unlinking repeater
This commit is contained in:
commit
91c7f30616
@ -233,8 +233,8 @@ void CP25Reflector::run()
|
|||||||
|
|
||||||
for (std::vector<CP25Repeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
|
for (std::vector<CP25Repeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
|
||||||
if (CUDPSocket::match((*it)->m_addr, rpt->m_addr)) {
|
if (CUDPSocket::match((*it)->m_addr, rpt->m_addr)) {
|
||||||
m_repeaters.erase(it);
|
|
||||||
delete *it;
|
delete *it;
|
||||||
|
m_repeaters.erase(it);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -304,8 +304,8 @@ void CP25Reflector::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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user