RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:37:43 +00:00
Code Issues Activity Actions

LibWasm: Make MemoryInstance allocation fail if initial growth fails

Browse source 
...instead of silently ignoring the failure in the constructor.
This commit is contained in:
Ali Mohammad Pur 2022-02-15 03:05:49 +03:30 • committed by Ali Mohammad Pur
parent 117ca843bd
commit 4f2d898a51
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp
View file

@ -43,7 +43,11 @@ Optional<TableAddress> Store::allocate(TableType const& type)
Optional<MemoryAddress> Store::allocate(MemoryType const& type) Optional<MemoryAddress> Store::allocate(MemoryType const& type)
{ {
MemoryAddress address { m_memories.size() }; MemoryAddress address { m_memories.size() };
m_memories.empend(MemoryInstance { type }); auto instance = MemoryInstance::create(type);
if (instance.is_error())
return {};
m_memories.append(instance.release_value());
return address; return address;
} }

15
Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
View file

@ -331,10 +331,14 @@ private:
class MemoryInstance { class MemoryInstance {
public: public:
explicit MemoryInstance(MemoryType const& type) static ErrorOr<MemoryInstance> create(MemoryType const& type)
: m_type(type)
{ {
grow(m_type.limits().min() * Constants::page_size); MemoryInstance instance { type };
if (!instance.grow(type.limits().min() * Constants::page_size))
return Error::from_string_literal("Failed to grow to requested size");
return { move(instance) };
} }
auto& type() const { return m_type; } auto& type() const { return m_type; }
@ -364,6 +368,11 @@ public:
} }
private: private:
explicit MemoryInstance(MemoryType const& type)
: m_type(type)
{
}
MemoryType const& m_type; MemoryType const& m_type;
size_t m_size { 0 }; size_t m_size { 0 };
ByteBuffer m_data; ByteBuffer m_data;