Permalink
Browse files

NetworkPacket::putRawPacket: resize m_data to datasize + memcpy

In some cases NetworkPacket was created using default constructor and m_data is not properly sized.
This fixed out of bounds memory copy
Also use memcpy instead of std::vector affectation to enhance packet creation
  • Loading branch information...
1 parent 0c9ca27 commit 9d295906efc7eec58dba3f7494f4e444d2c8d00f @nerzhul nerzhul committed Oct 9, 2017
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/network/networkpacket.cpp
@@ -59,9 +59,11 @@ void NetworkPacket::putRawPacket(u8 *data, u32 datasize, session_t peer_id)
m_datasize = datasize - 2;
m_peer_id = peer_id;
+ m_data.resize(m_datasize);
+
// split command and datas
m_command = readU16(&data[0]);
- m_data = std::vector<u8>(&data[2], &data[2 + m_datasize]);
+ memcpy(&m_data[0], &data[2], m_datasize);
}
const char* NetworkPacket::getString(u32 from_offset)

0 comments on commit 9d29590

Please sign in to comment.