RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:17:35 +00:00
Code Issues Activity Actions

AK: Fix ByteBuffer zero bytes allocations

Browse source
This commit is contained in:
Tom 2020-08-30 09:00:57 -06:00 • committed by Andreas Kling
parent 9ad5a261f7
commit f5bc7dbfda
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
AK/ByteBuffer.h
View file

@ -256,6 +256,7 @@ private:
inline ByteBufferImpl::ByteBufferImpl(size_t size) inline ByteBufferImpl::ByteBufferImpl(size_t size)
: m_size(size) : m_size(size)
{ {
if (size != 0)
m_data = static_cast<u8*>(kmalloc(size)); m_data = static_cast<u8*>(kmalloc(size));
m_owned = true; m_owned = true;
} }
@ -264,8 +265,10 @@ inline ByteBufferImpl::ByteBufferImpl(const void* data, size_t size, Constructio
: m_size(size) : m_size(size)
{ {
ASSERT(mode == Copy); ASSERT(mode == Copy);
if (size != 0) {
m_data = static_cast<u8*>(kmalloc(size)); m_data = static_cast<u8*>(kmalloc(size));
__builtin_memcpy(m_data, data, size); __builtin_memcpy(m_data, data, size);
}
m_owned = true; m_owned = true;
} }
@ -284,11 +287,19 @@ inline void ByteBufferImpl::grow(size_t size)
{ {
ASSERT(size > m_size); ASSERT(size > m_size);
ASSERT(m_owned); ASSERT(m_owned);
if (size == 0) {
if (m_data)
kfree(m_data);
m_data = nullptr;
m_size = 0;
return;
}
u8* new_data = static_cast<u8*>(kmalloc(size)); u8* new_data = static_cast<u8*>(kmalloc(size));
__builtin_memcpy(new_data, m_data, m_size); __builtin_memcpy(new_data, m_data, m_size);
u8* old_data = m_data; u8* old_data = m_data;
m_data = new_data; m_data = new_data;
m_size = size; m_size = size;
if (old_data)
kfree(old_data); kfree(old_data);
} }
@ -300,6 +311,7 @@ inline NonnullRefPtr<ByteBufferImpl> ByteBufferImpl::create_uninitialized(size_t
inline NonnullRefPtr<ByteBufferImpl> ByteBufferImpl::create_zeroed(size_t size) inline NonnullRefPtr<ByteBufferImpl> ByteBufferImpl::create_zeroed(size_t size)
{ {
auto buffer = ::adopt(*new ByteBufferImpl(size)); auto buffer = ::adopt(*new ByteBufferImpl(size));
if (size != 0)
__builtin_memset(buffer->data(), 0, size); __builtin_memset(buffer->data(), 0, size);
return buffer; return buffer;
} }