MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 00:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disabled broken memcpy() causing segfault

Browse Source
This commit is contained in:
Simon
2016-09-19 18:07:14 +01:00
parent fa010caab8
commit aa69f1a660
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DMRAccessControl.cpp
View File

@@ -203,18 +203,18 @@ bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id,
unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC) unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC)
{ {
if (slot == 1 && m_TGRewriteSlot1 == false) // if (slot == 1 && m_TGRewriteSlot1 == false)
return 0; // return 0;
if (slot == 2 && m_TGRewriteSlot2 == false) // if (slot == 2 && m_TGRewriteSlot2 == false)
return 0; // return 0;
std::time_t currenttime = std::time(nullptr); std::time_t currenttime = std::time(nullptr);
if (network) { if (network) {
m_dstRewriteID = did; m_dstRewriteID = did;
m_SrcID = sid; m_SrcID = sid;
memcpy(&dmrLC, &m_lastdmrLC, sizeof(dmrLC)); //memcpy(&dmrLC, &m_lastdmrLC, sizeof(dmrLC));
if ( (did < 4000 || did > 5000) && did > 0 && did != 9 && dmrLC->getFLCO() == FLCO_GROUP ) { if ( (did < 4000 || did > 5000) && did > 0 && did != 9 && dmrLC->getFLCO() == FLCO_GROUP ) {
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did); LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did);
return 9; return 9;