monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-23 19:15:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #9584

Browse source 
74c3134 Fix memcpy in byte_slice constructor (Lee *!* Clagett)
This commit is contained in:
luigi1111 2024-12-23 10:59:22 -05:00
commit e2fcb9141f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/epee/src/byte_slice.cpp
View file

@ -152,7 +152,11 @@ namespace epee
{ {
std::size_t space_needed = 0; std::size_t space_needed = 0;
for (const auto& source : sources) for (const auto& source : sources)
{
if (std::numeric_limits<std::size_t>::max() - space_needed < source.size())
throw std::bad_alloc{};
space_needed += source.size(); space_needed += source.size();
}
if (space_needed) if (space_needed)
{ {
@ -162,9 +166,9 @@ namespace epee
for (const auto& source : sources) for (const auto& source : sources)
{ {
assert(source.size() <= out.size()); // see check above
std::memcpy(out.data(), source.data(), source.size()); std::memcpy(out.data(), source.data(), source.size());
if (out.remove_prefix(source.size()) < source.size()) out.remove_prefix(source.size());
throw std::bad_alloc{}; // size_t overflow on space_needed
} }
storage_ = std::move(storage); storage_ = std::move(storage);
} }