rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace unsafe casts with memcpy ops

This commit is contained in:
Andrew Nelless 2016-09-09 13:47:41 +01:00
parent 90c3dd6622
commit e81f7ab8c7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/synergy/ClipboardChunk.cpp
View File

@ -21,6 +21,7 @@
#include "synergy/protocol_types.h" #include "synergy/protocol_types.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/Log.h" #include "base/Log.h"
#include <cstring>
size_t ClipboardChunk::s_expectedSize = 0; size_t ClipboardChunk::s_expectedSize = 0;
@ -41,8 +42,7 @@ ClipboardChunk::start(
char* chunk = start->m_chunk; char* chunk = start->m_chunk;
chunk[0] = id; chunk[0] = id;
UInt32* seq = static_cast<UInt32*>(&chunk[1]); std::memcpy (&chunk[1], &sequence, 4);
*seq = sequence;
chunk[5] = kDataStart; chunk[5] = kDataStart;
memcpy(&chunk[6], size.c_str(), sizeLength); memcpy(&chunk[6], size.c_str(), sizeLength);
chunk[sizeLength + CLIPBOARD_CHUNK_META_SIZE - 1] = '\0'; chunk[sizeLength + CLIPBOARD_CHUNK_META_SIZE - 1] = '\0';
@ -61,8 +61,7 @@ ClipboardChunk::data(
char* chunkData = chunk->m_chunk; char* chunkData = chunk->m_chunk;
chunkData[0] = id; chunkData[0] = id;
UInt32* seq = static_cast<UInt32*>(&chunkData[1]); std::memcpy (&chunkData[1], &sequence, 4);
*seq = sequence;
chunkData[5] = kDataChunk; chunkData[5] = kDataChunk;
memcpy(&chunkData[6], data.c_str(), dataSize); memcpy(&chunkData[6], data.c_str(), dataSize);
chunkData[dataSize + CLIPBOARD_CHUNK_META_SIZE - 1] = '\0'; chunkData[dataSize + CLIPBOARD_CHUNK_META_SIZE - 1] = '\0';
@ -77,8 +76,7 @@ ClipboardChunk::end(ClipboardID id, UInt32 sequence)
char* chunk = end->m_chunk; char* chunk = end->m_chunk;
chunk[0] = id; chunk[0] = id;
UInt32* seq = static_cast<UInt32*>(&chunk[1]); std::memcpy (&chunk[1], &sequence, 4);
*seq = sequence;
chunk[5] = kDataEnd; chunk[5] = kDataEnd;
chunk[CLIPBOARD_CHUNK_META_SIZE - 1] = '\0'; chunk[CLIPBOARD_CHUNK_META_SIZE - 1] = '\0';
@ -133,8 +131,8 @@ ClipboardChunk::send(synergy::IStream* stream, void* data)
char* chunk = clipboardData->m_chunk; char* chunk = clipboardData->m_chunk;
ClipboardID id = chunk[0]; ClipboardID id = chunk[0];
UInt32* seq = static_cast<UInt32*>(&chunk[1]); UInt32 sequence;
UInt32 sequence = *seq; std::memcpy (&sequence, &chunk[1], 4);
UInt8 mark = chunk[5]; UInt8 mark = chunk[5];
String dataChunk(&chunk[6], clipboardData->m_dataSize); String dataChunk(&chunk[6], clipboardData->m_dataSize);