Skip to content
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

cpp: Fix for undefined behavior in mcap::ParseByteArray(..) #1239

Merged
merged 2 commits into from
Sep 24, 2024
Merged

cpp: Fix for undefined behavior in mcap::ParseByteArray(..) #1239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45a444a
Fix for undefined behavior in mcap::ParseByteArray(..)
MichaelOrlov Sep 19, 2024
31cc546
Add comment before check 'if (size > 0)'
MichaelOrlov Sep 21, 2024
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
6 changes: 5 additions & 1 deletion cpp/mcap/include/mcap/internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,11 @@ inline Status ParseByteArray(const std::byte* data, uint64_t maxSize, ByteArray*
return Status(StatusCode::InvalidRecord, msg);
}
output->resize(size);
std::memcpy(output->data(), data + 4, size);
// output->data() may return nullptr if 'output' is empty, but memcpy() does not accept nullptr.
// 'output' will be empty only if the 'size' is equal to 0.
if (size > 0) {
std::memcpy(output->data(), data + 4, size);
}
return StatusCode::Success;
}

Expand Down
Loading