LibWasm: Validate number of data sections

mnek84 · Jun 10, 2024 · e64ac8c · e64ac8c
1 parent a9f3afc
commit e64ac8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Userland/Libraries/LibWasm/AbstractMachine/Validator.cpp b/Userland/Libraries/LibWasm/AbstractMachine/Validator.cpp
@@ -41,6 +41,10 @@ ErrorOr<void, ValidationError> Validator::validate(Module& module)
         m_context.types.extend(section.types());
     });
 
+    module.for_each_section_of_type<DataCountSection>([this](DataCountSection const& section) {
+        m_context.data_count = section.count();
+    });
+
     module.for_each_section_of_type<ImportSection>([&](ImportSection const& section) {
         for (auto& import_ : section.imports()) {
             import_.description().visit(
@@ -177,6 +181,8 @@ ErrorOr<void, ValidationError> Validator::validate(StartSection const& section)
 
 ErrorOr<void, ValidationError> Validator::validate(DataSection const& section)
 {
+    if (m_context.data_count.has_value() && section.data().size() != m_context.data_count)
+        return Errors::invalid("data count does not match segment count"sv);
     for (auto& entry : section.data()) {
         TRY(entry.value().visit(
             [](DataSection::Data::Passive const&) { return ErrorOr<void, ValidationError> {}; },

diff --git a/Userland/Libraries/LibWasm/AbstractMachine/Validator.h b/Userland/Libraries/LibWasm/AbstractMachine/Validator.h
@@ -27,6 +27,7 @@ struct Context {
     COWVector<bool> datas;
     COWVector<ValueType> locals;
     COWVector<ResultType> labels;
+    Optional<u32> data_count;
     Optional<ResultType> return_;
     AK::HashTable<FunctionIndex> references;
     size_t imported_function_count { 0 };