Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced all reinterpret_casts with memcpys when reading from Packet.

Browse Source
This commit is contained in:
acsbendi 2019-04-17 01:42:50 +02:00 committed by Lukas Dürrenberger
parent 1d1415c982
commit 808adedf13
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/SFML/Network/Packet.cpp
View File

@ -123,7 +123,7 @@ Packet& Packet::operator >>(Int8& data)
{ {
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
data = *reinterpret_cast<const Int8*>(&m_data[m_readPos]); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -136,7 +136,7 @@ Packet& Packet::operator >>(Uint8& data)
{ {
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
data = *reinterpret_cast<const Uint8*>(&m_data[m_readPos]); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -149,7 +149,8 @@ Packet& Packet::operator >>(Int16& data)
{ {
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
data = ntohs(*reinterpret_cast<const Int16*>(&m_data[m_readPos])); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
data = ntohs(data);
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -162,7 +163,8 @@ Packet& Packet::operator >>(Uint16& data)
{ {
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
data = ntohs(*reinterpret_cast<const Uint16*>(&m_data[m_readPos])); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
data = ntohs(data);
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -175,7 +177,8 @@ Packet& Packet::operator >>(Int32& data)
{ {
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
data = ntohl(*reinterpret_cast<const Int32*>(&m_data[m_readPos])); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
data = ntohl(data);
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -188,7 +191,8 @@ Packet& Packet::operator >>(Uint32& data)
{ {
if (checkSize(sizeof(data))) if (checkSize(sizeof(data)))
{ {
data = ntohl(*reinterpret_cast<const Uint32*>(&m_data[m_readPos])); std::memcpy(&data, &m_data[m_readPos], sizeof(data));
data = ntohl(data);
m_readPos += sizeof(data); m_readPos += sizeof(data);
} }
@ -203,7 +207,8 @@ Packet& Packet::operator >>(Int64& data)
{ {
// Since ntohll is not available everywhere, we have to convert // Since ntohll is not available everywhere, we have to convert
// to network byte order (big endian) manually // to network byte order (big endian) manually
const Uint8* bytes = reinterpret_cast<const Uint8*>(&m_data[m_readPos]); Uint8 bytes[sizeof(data)];
std::memcpy(bytes, &m_data[m_readPos], sizeof(data));
data = (static_cast<Int64>(bytes[0]) << 56) | data = (static_cast<Int64>(bytes[0]) << 56) |
(static_cast<Int64>(bytes[1]) << 48) | (static_cast<Int64>(bytes[1]) << 48) |
(static_cast<Int64>(bytes[2]) << 40) | (static_cast<Int64>(bytes[2]) << 40) |
@ -226,7 +231,8 @@ Packet& Packet::operator >>(Uint64& data)
{ {
// Since ntohll is not available everywhere, we have to convert // Since ntohll is not available everywhere, we have to convert
// to network byte order (big endian) manually // to network byte order (big endian) manually
const Uint8* bytes = reinterpret_cast<const Uint8*>(&m_data[m_readPos]); Uint8 bytes[sizeof(data)];
std::memcpy(bytes, &m_data[m_readPos], sizeof(data));
data = (static_cast<Uint64>(bytes[0]) << 56) | data = (static_cast<Uint64>(bytes[0]) << 56) |
(static_cast<Uint64>(bytes[1]) << 48) | (static_cast<Uint64>(bytes[1]) << 48) |
(static_cast<Uint64>(bytes[2]) << 40) | (static_cast<Uint64>(bytes[2]) << 40) |