thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-20 05:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix UB misaligned address

Browse Source
This commit is contained in:
Yakov Olkhovskiy 2024-06-14 15:56:14 +00:00
parent 97aea86376
commit 14a13d54c0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/IO/WriteBufferFromPocoSocketChunked.h
View File

@ -6,6 +6,18 @@
#include <IO/NetUtils.h> #include <IO/NetUtils.h>
namespace
{
template <typename T>
const T & setValue(T * typed_ptr, std::type_identity_t<T> val)
{
memcpy(typed_ptr, &val, sizeof(T));
return *typed_ptr;
}
}
namespace DB namespace DB
{ {
@ -40,7 +52,7 @@ public:
chassert(reinterpret_cast<Position>(chunk_size_ptr) == working_buffer.begin()); chassert(reinterpret_cast<Position>(chunk_size_ptr) == working_buffer.begin());
*chunk_size_ptr = 0; setValue(chunk_size_ptr, 0);
/// Initialize next chunk /// Initialize next chunk
chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(pos); chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(pos);
pos += std::min(available(), sizeof(*chunk_size_ptr)); pos += std::min(available(), sizeof(*chunk_size_ptr));
@ -58,7 +70,7 @@ public:
} }
/// Fill up current chunk size /// Fill up current chunk size
*chunk_size_ptr = toLittleEndian(static_cast<UInt32>(pos - reinterpret_cast<Position>(chunk_size_ptr) - sizeof(*chunk_size_ptr))); setValue(chunk_size_ptr, toLittleEndian(static_cast<UInt32>(pos - reinterpret_cast<Position>(chunk_size_ptr) - sizeof(*chunk_size_ptr))));
if (!chunk_started) if (!chunk_started)
LOG_TEST(log, "{} -> {} Chunk send started. Message {}, size {}", LOG_TEST(log, "{} -> {} Chunk send started. Message {}, size {}",
@ -174,7 +186,7 @@ protected:
pos -= sizeof(*chunk_size_ptr); pos -= sizeof(*chunk_size_ptr);
else // fill up current chunk size else // fill up current chunk size
{ {
*chunk_size_ptr = toLittleEndian(static_cast<UInt32>(pos - reinterpret_cast<Position>(chunk_size_ptr) - sizeof(*chunk_size_ptr))); setValue(chunk_size_ptr, toLittleEndian(static_cast<UInt32>(pos - reinterpret_cast<Position>(chunk_size_ptr) - sizeof(*chunk_size_ptr))));
if (!chunk_started) if (!chunk_started)
{ {
chunk_started = true; chunk_started = true;