Skip to content

Add explicit check for imported limits validity #762

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

Merged
gumb0 merged 2 commits into from
Mar 30, 2021
Merged

Add explicit check for imported limits validity #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22fc4f7
test: Imported memory/tables limits having max less than min
gumb0 Mar 17, 2021
52defb1
Add check to instantiate for imported memory/table limits validity
gumb0 Mar 17, 2021
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
3 changes: 3 additions & 0 deletions lib/fizzy/instantiate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ void match_imported_functions(const std::vector<FuncType>& module_imported_types

void match_limits(const Limits& external_limits, const Limits& module_limits)
{
if (external_limits.max.has_value() && external_limits.min > *external_limits.max)
throw instantiate_error{"provided import's min limit is above import's max limit"};

if (external_limits.min < module_limits.min)
throw instantiate_error{"provided import's min is below import's min defined in module"};

Expand Down
8 changes: 8 additions & 0 deletions test/unittests/instantiate_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ TEST(instantiate, imported_table_invalid)
EXPECT_THROW_MESSAGE(instantiate(*module, {}, {{&table, {10, std::nullopt}}}),
instantiate_error, "provided import's max is above import's max defined in module");

// Provided limits have max less than min
EXPECT_THROW_MESSAGE(instantiate(*module, {}, {{&table, {10, 0}}}), instantiate_error,
"provided import's min limit is above import's max limit");

// Null pointer
EXPECT_THROW_MESSAGE(instantiate(*module, {}, {{nullptr, {10, 30}}}), instantiate_error,
"provided imported table has a null pointer to data");
Expand Down Expand Up @@ -283,6 +287,10 @@ TEST(instantiate, imported_memory_invalid)
EXPECT_THROW_MESSAGE(instantiate(*module, {}, {}, {{&memory, {1, std::nullopt}}}),
instantiate_error, "provided import's max is above import's max defined in module");

// Provided limits have max less than min
EXPECT_THROW_MESSAGE(instantiate(*module, {}, {}, {{&memory, {1, 0}}}), instantiate_error,
"provided import's min limit is above import's max limit");

// Null pointer
EXPECT_THROW_MESSAGE(instantiate(*module, {}, {}, {{nullptr, {1, 3}}}), instantiate_error,
"provided imported memory has a null pointer to data");
Expand Down