system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Correct ByteBuffer::{overwrite,slice*} bounds check

Browse source
This commit is contained in:
AnotherTest 2020-04-27 21:53:39 +04:30 committed by Andreas Kling
parent 7f1d3f6d62
commit cf5941c972
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
AK/ByteBuffer.h
View file

@ -94,9 +94,9 @@ private:
Wrap,
Adopt
};
explicit ByteBufferImpl(size_t); // For ConstructionMode=Uninitialized
explicit ByteBufferImpl(size_t); // For ConstructionMode=Uninitialized
ByteBufferImpl(const void*, size_t, ConstructionMode); // For ConstructionMode=Copy
ByteBufferImpl(void*, size_t, ConstructionMode); // For ConstructionMode=Wrap/Adopt
ByteBufferImpl(void*, size_t, ConstructionMode); // For ConstructionMode=Wrap/Adopt
ByteBufferImpl() {}
u8* m_data { nullptr };
@ -183,10 +183,10 @@ public:
{
if (is_null())
return {};
if (offset >= this->size())
return {};
if (offset + size >= this->size())
size = this->size() - offset;
// I cannot hand you a slice I don't have
ASSERT(offset + size <= this->size());
return wrap(offset_pointer(offset), size);
}
@ -194,10 +194,10 @@ public:
{
if (is_null())
return {};
if (offset >= this->size())
return {};
if (offset + size >= this->size())
size = this->size() - offset;
// I cannot hand you a slice I don't have
ASSERT(offset + size <= this->size());
return copy(offset_pointer(offset), size);
}
@ -222,7 +222,7 @@ public:
void overwrite(size_t offset, const void* data, size_t data_size)
{
// make sure we're not told to write past the end
ASSERT(offset + data_size < size());
ASSERT(offset + data_size <= size());
__builtin_memcpy(this->data() + offset, data, data_size);
}