LX3JL/xlxd
1
0
Fork 0
mirror of https://github.com/LX3JL/xlxd.git synced 2025-12-06 07:42:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 1 byte buffer overflow in AMBE handling

Browse source
This commit is contained in:
iamsi 2021-03-16 18:34:22 +00:00
parent 73516e9f14
commit 1ffcee24ca
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cdmrmmdvmprotocol.cpp
View file

@ -739,7 +739,7 @@ bool CDmrmmdvmProtocol::IsValidDvFramePacket(const CBuffer &Buffer, CDvFramePack
memcpy(dmr3ambe, dmrframe, 14); memcpy(dmr3ambe, dmrframe, 14);
dmr3ambe[13] &= 0xF0; dmr3ambe[13] &= 0xF0;
dmr3ambe[13] |= (dmrframe[19] & 0x0F); dmr3ambe[13] |= (dmrframe[19] & 0x0F);
memcpy(&dmr3ambe[14], &dmrframe[20], 14); memcpy(&dmr3ambe[14], &dmrframe[20], 13);
// extract sync // extract sync
dmrsync[0] = dmrframe[13] & 0x0F; dmrsync[0] = dmrframe[13] & 0x0F;
::memcpy(&dmrsync[1], &dmrframe[14], 5); ::memcpy(&dmrsync[1], &dmrframe[14], 5);

2
src/cdmrplusprotocol.cpp
View file

@ -521,7 +521,7 @@ bool CDmrplusProtocol::IsValidDvFramePacket(const CIp &Ip, const CBuffer &Buffer
memcpy(dmr3ambe, dmrframe, 14); memcpy(dmr3ambe, dmrframe, 14);
dmr3ambe[13] &= 0xF0; dmr3ambe[13] &= 0xF0;
dmr3ambe[13] |= (dmrframe[19] & 0x0F); dmr3ambe[13] |= (dmrframe[19] & 0x0F);
memcpy(&dmr3ambe[14], &dmrframe[20], 14); memcpy(&dmr3ambe[14], &dmrframe[20], 13);
// extract sync // extract sync
dmrsync[0] = dmrframe[13] & 0x0F; dmrsync[0] = dmrframe[13] & 0x0F;
::memcpy(&dmrsync[1], &dmrframe[14], 5); ::memcpy(&dmrsync[1], &dmrframe[14], 5);