Skip to content

[AVRO-4248] Fix misaligned pointer use in BufferDetail.hh and BufferReader.hh #3740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apilloud wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

[AVRO-4248] Fix misaligned pointer use in BufferDetail.hh and BufferReader.hh #3740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lang/c++/include/avro/buffer/BufferReader.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define avro_BufferReader_hh__

#include "Buffer.hh"
#include <cstring>
#include <type_traits>

#ifdef min
Expand Down Expand Up @@ -233,7 +234,7 @@ private:
}

if (sizeof(T) <= chunkRemaining()) {
val = *(reinterpret_cast<const T *>(addr()));
memcpy(&val, addr(), sizeof(T));
incrementChunk(sizeof(T));
} else {
read(reinterpret_cast<data_type *>(&val), sizeof(T));
Expand Down
3 changes: 2 additions & 1 deletion lang/c++/include/avro/buffer/detail/BufferDetail.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define avro_BufferDetail_hh__

#include <cassert>
#include <cstring>
#include <deque>
#include <exception>
#include <functional>
Expand Down Expand Up @@ -320,7 +321,7 @@ public:
if (freeSpace_ && (sizeof(T) <= writeChunks_.front().freeSize())) {
// fast path, there's enough room in the writeable chunk to just
// straight out copy it
*(reinterpret_cast<T *>(writeChunks_.front().tellWritePos())) = val;
memcpy(writeChunks_.front().tellWritePos(), &val, sizeof(T));
Comment thread
apilloud marked this conversation as resolved.
postWrite(sizeof(T));
} else {
// need to fixup chunks first, so use the regular memcpy
Copy link
Copy Markdown
Member

@martin-g martin-g Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the else clause the comment mentions memcpy but still uses reinterpret_cast.

I am not C++ dev, so I don't know whether this needs fixing or not.

Copy link
Copy Markdown
Member Author

@apilloud apilloud Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The actual implementation of writeTo is a memcpy:
https://github.com/apache/avro/pull/3740/changes/BASE..14aa89a4aded2b202e6402a6c277d40ed7cfd5b2#diff-e480d7690c296659bf5547ee3c64047c8902d7f9343c55f404b985b383d3ae66R351

Expand Down
Loading